Unified Broken Sword 1 & 2 name (instead of I & II) -- usage is more consistent with other numerically numbered games (and also internally consistent). Work in progress.

svn-id: r19249

7 files changed, 26 insertions, 26 deletions

diff --git a/AUTHORS b/AUTHORS
index 48f945ab4e..6af5fdd929 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -1,10 +1,10 @@
 The ScummVM team:
        James Brown           - Lead developer
        Max Horn              - Lead developer
-       Torbjorn Andersson    - Engine: SCUMM, Broken Sword II, SAGA, Gob
+       Torbjorn Andersson    - Engine: SCUMM, Broken Sword 2, SAGA, Gob
        David Eriksson        - Engine: Flight of the Amazon Queen
-       Robert Goeffringmann  - Engine: Beneath a Steel Sky, Broken Sword I
-       Jonathan Gray         - Engine: SCUMM, HE, Broken Sword II
+       Robert Goeffringmann  - Engine: Beneath a Steel Sky, Broken Sword 1
+       Jonathan Gray         - Engine: SCUMM, HE, Broken Sword 2
        Travis Howell         - Engine: SCUMM, HE, Simon the Sorcerer
        Oliver Kiehl          - Engine: Beneath a Steel Sky, Simon
        Pawel Kolodziejski    - Engine: SCUMM (Codecs, iMUSE, Smush, etc.)
diff --git a/README b/README
index 16a38eef5d..83a1d2fd09 100644
--- a/README
+++ b/README
@@ -152,8 +152,8 @@ SCUMM Games by Humongous Entertainment:
 
 Other Games:
      Beneath a Steel Sky                             [Game: sky]
-     Broken Sword I                                  [Game: sword1]
-     Broken Sword II                                 [Game: sword2]
+     Broken Sword 1                                  [Game: sword1]
+     Broken Sword 2                                 [Game: sword2]
      Flight of the Amazon Queen                      [Game: queen]
      Gobliiins                                       [Game: gob1]
      Inherit the Earth: Quest for the Orb            [Game: ite]
@@ -533,7 +533,7 @@ Curse of Monkey Island
         zh  - Chinese
         kr  - Korean
 
-Beneath a Steel Sky:
+Beneath a Steel Sky
         gb  - English (Great Britain) (default)
         en  - English USA
         de  - German
@@ -552,7 +552,7 @@ Broken Sword 1
         pt  - Portuguese
         cz  - Czech
 
-Simon the Sorcerer: 1 & 2
+Simon the Sorcerer 1 & 2
         en  - English (default)
         de  - German
         fr  - French
@@ -648,10 +648,10 @@ simon games.
         Escape                 - Skips the game intro
         Period (.)             - Skips current line of text
 
-    Broken Sword I:
+    Broken Sword 1:
         F5 or ESC              - Displays save/load box
 
-    Broken Sword II:
+    Broken Sword 2:
         Ctrl-d                 - Starts the debugger
         c                      - Display the credits
         p                      - Pauses
@@ -791,7 +791,7 @@ Windows example:
 Because ScummVM is still a beta product, it -can- crash and/or hang
 occasionally. As such, every five minutes it will save a game in Slot 0. This
 game can be loaded via Ctrl-0, or the F5 menu. This autosaving does not, 
-however, occur with Simon the Sorcerer 1 and 2, nor with Broken Sword I and II.
+however, occur with Simon the Sorcerer 1 and 2, nor with Broken Sword 1 and 2.
 
 
 7.0) Music and Sound: 
@@ -1250,7 +1250,7 @@ The following keywords are recognized:
 
         boot_param      number   Pass this number to the boot script
 
-Broken Sword II adds the following non-standard keywords:
+Broken Sword 2 adds the following non-standard keywords:
 
         gfx_details     number   Graphics details setting (0-3)
         music_mute      bool     If true, music is muted
diff --git a/doc/10.tex b/doc/10.tex
index 99606dfd36..9140b75c32 100644
--- a/doc/10.tex
+++ b/doc/10.tex
@@ -5,10 +5,10 @@
   \begin{tabular}[h]{p{4cm}l}
     James Brown & Lead developer\\
     Max Horn & Lead developer\\
-    Torbj\"orn Andersson & Engine: SCUMM, Broken Sword II, SAGA, Gob\\
+    Torbj\"orn Andersson & Engine: SCUMM, Broken Sword 2, SAGA, Gob\\
     David Eriksson & Engine: Flight of the Amazon Queen\\
-    Robert G\"offringmann & Engine: Beneath a Steel Sky, Broken Sword I\\
-    Jonathan Gray & Engine: SCUMM, HE, Broken Sword II\\
+    Robert G\"offringmann & Engine: Beneath a Steel Sky, Broken Sword 1\\
+    Jonathan Gray & Engine: SCUMM, HE, Broken Sword 2\\
     Travis Howell & Engine: SCUMM, HE, Simon the Sorcerer\\
     Oliver Kiehl & Engine: Beneath a Steel Sky, Simon\\
     Pawe{\l} Ko{\l}odziejski & Engine: SCUMM (Codecs, iMUSE, Smush, etc.)\\
diff --git a/gui/credits.h b/gui/credits.h
index d7b36e10ca..9af85aa763 100644
--- a/gui/credits.h
+++ b/gui/credits.h
@@ -6,13 +6,13 @@ static const char *credits[] = {
 "\\L\\c0""  Max Horn",
 "\\L\\c2""    Lead developer",
 "\\L\\c0""  Torbjorn Andersson",
-"\\L\\c2""    Engine: SCUMM, Broken Sword II, SAGA, Gob",
+"\\L\\c2""    Engine: SCUMM, Broken Sword 2, SAGA, Gob",
 "\\L\\c0""  David Eriksson",
 "\\L\\c2""    Engine: Flight of the Amazon Queen",
 "\\L\\c0""  Robert Goeffringmann",
-"\\L\\c2""    Engine: Beneath a Steel Sky, Broken Sword I",
+"\\L\\c2""    Engine: Beneath a Steel Sky, Broken Sword 1",
 "\\L\\c0""  Jonathan Gray",
-"\\L\\c2""    Engine: SCUMM, HE, Broken Sword II",
+"\\L\\c2""    Engine: SCUMM, HE, Broken Sword 2",
 "\\L\\c0""  Travis Howell",
 "\\L\\c2""    Engine: SCUMM, HE, Simon the Sorcerer",
 "\\L\\c0""  Oliver Kiehl",
diff --git a/sword1/sword1.cpp b/sword1/sword1.cpp
index 2ab985e93f..4e6a480a73 100644
--- a/sword1/sword1.cpp
+++ b/sword1/sword1.cpp
@@ -48,9 +48,9 @@ using namespace Sword1;
 
 /* Broken Sword 1 */
 static const GameSettings sword1FullSettings =
-	{"sword1", "Broken Sword I", GF_DEFAULT_TO_1X_SCALER};
+	{"sword1", "Broken Sword 1", GF_DEFAULT_TO_1X_SCALER};
 static const GameSettings sword1DemoSettings =
-	{"sword1demo", "Broken Sword I (Demo)", GF_DEFAULT_TO_1X_SCALER | Sword1::GF_DEMO };
+	{"sword1demo", "Broken Sword 1 (Demo)", GF_DEFAULT_TO_1X_SCALER | Sword1::GF_DEMO };
 
 // check these subdirectories (if present)
 static const char *g_dirNames[] = {	"clusters",	"speech" };
diff --git a/sword2/sword2.cpp b/sword2/sword2.cpp
index d61672d8e2..846885216f 100644
--- a/sword2/sword2.cpp
+++ b/sword2/sword2.cpp
@@ -58,9 +58,9 @@ struct Sword2GameSettings {
 
 static const Sword2GameSettings sword2_settings[] = {
 	/* Broken Sword 2 */
-	{"sword2", "Broken Sword II", GF_DEFAULT_TO_1X_SCALER, "players.clu" },
-	{"sword2alt", "Broken Sword II (alt)", GF_DEFAULT_TO_1X_SCALER, "r2ctlns.ocx" },
-	{"sword2demo", "Broken Sword II (Demo)", GF_DEFAULT_TO_1X_SCALER | Sword2::GF_DEMO, "players.clu" },
+	{"sword2", "Broken Sword 2", GF_DEFAULT_TO_1X_SCALER, "players.clu" },
+	{"sword2alt", "Broken Sword 2 (alt)", GF_DEFAULT_TO_1X_SCALER, "r2ctlns.ocx" },
+	{"sword2demo", "Broken Sword 2 (Demo)", GF_DEFAULT_TO_1X_SCALER | Sword2::GF_DEMO, "players.clu" },
 	{NULL, NULL, 0, NULL}
 };
 
@@ -103,7 +103,7 @@ Engine *Engine_SWORD2_create(GameDetector *detector, OSystem *syst) {
 	return new Sword2::Sword2Engine(detector, syst);
 }
 
-REGISTER_PLUGIN(SWORD2, "Broken Sword II")
+REGISTER_PLUGIN(SWORD2, "Broken Sword 2")
 
 namespace Sword2 {
 
diff --git a/tools/credits.pl b/tools/credits.pl
index 40c458fc4a..8b10083e8c 100755
--- a/tools/credits.pl
+++ b/tools/credits.pl
@@ -320,10 +320,10 @@ begin_credits("Credits");
   begin_section("The ScummVM team");
 	add_person('James Brown', 'endy', "Lead developer");
 	add_person('Max Horn', 'fingolfin', "Lead developer");
-	add_person("Torbjörn Andersson", "eriktorbjorn", "Engine: SCUMM, Broken Sword II, SAGA, Gob");
+	add_person("Torbjörn Andersson", "eriktorbjorn", "Engine: SCUMM, Broken Sword 2, SAGA, Gob");
 	add_person("David Eriksson", "twogood", "Engine: Flight of the Amazon Queen");
-	add_person("Robert Göffringmann", "lavosspawn", "Engine: Beneath a Steel Sky, Broken Sword I");
-	add_person("Jonathan Gray", "khalek", "Engine: SCUMM, HE, Broken Sword II");
+	add_person("Robert Göffringmann", "lavosspawn", "Engine: Beneath a Steel Sky, Broken Sword 1");
+	add_person("Jonathan Gray", "khalek", "Engine: SCUMM, HE, Broken Sword 2");
 	add_person("Travis Howell", "Kirben", "Engine: SCUMM, HE, Simon the Sorcerer");
 	add_person("Oliver Kiehl", "olki", "Engine: Beneath a Steel Sky, Simon");
 	add_person("Paweł Kołodziejski", "aquadran", "Engine: SCUMM (Codecs, iMUSE, Smush, etc.)");