From 410579ec66f7df8757cb980c0a78e3161b7f20d5 Mon Sep 17 00:00:00 2001
From: Simon Howard
Date: Wed, 30 Sep 2009 23:07:03 +0000
Subject: Change British English spellings to American English, for
 consistency.

Subversion-branch: /trunk/chocolate-doom
Subversion-revision: 1699
---
 setup/joystick.c    | 2 +-
 setup/mainmenu.c    | 6 +++---
 setup/multiplayer.c | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'setup')

diff --git a/setup/joystick.c b/setup/joystick.c
index fa59c559..867fa5c2 100644
--- a/setup/joystick.c
+++ b/setup/joystick.c
@@ -34,7 +34,7 @@ typedef enum
     CALIBRATE_UP,
 } calibration_stage_t;
 
-// SDL joystick successfully initialised?
+// SDL joystick successfully initialized?
 
 static int joystick_initted = 0;
 
diff --git a/setup/mainmenu.c b/setup/mainmenu.c
index c7e4f48d..ba85ca1f 100644
--- a/setup/mainmenu.c
+++ b/setup/mainmenu.c
@@ -138,7 +138,7 @@ void MainMenu(void)
 }
 
 //
-// Initialise all configuration variables, load config file, etc
+// Initialize all configuration variables, load config file, etc
 //
 
 static void InitConfig(void)
@@ -194,7 +194,7 @@ static void SetIcon(void)
 }
 
 // 
-// Initialise and run the textscreen GUI.
+// Initialize and run the textscreen GUI.
 //
 
 static void RunGUI(void)
@@ -203,7 +203,7 @@ static void RunGUI(void)
 
     if (!TXT_Init())
     {
-        fprintf(stderr, "Failed to initialise GUI\n");
+        fprintf(stderr, "Failed to initialize GUI\n");
         exit(-1);
     }
 
diff --git a/setup/multiplayer.c b/setup/multiplayer.c
index ee46c3f1..c5d0d1e9 100644
--- a/setup/multiplayer.c
+++ b/setup/multiplayer.c
@@ -716,7 +716,7 @@ void SetChatMacroDefaults(void)
         HUSTR_CHATMACRO0,
     };
     
-    // If the chat macros have not been set, initialise with defaults.
+    // If the chat macros have not been set, initialize with defaults.
 
     for (i=0; i<10; ++i)
     {
-- 
cgit v1.2.3