Merge post-0.7.0 commits through 'c8250d8b8' into v0.7.2.

sdl_common.c has lost some commits in the restructuring and those
will need to be replayed over the restructured files for SDL1 and 2.

sc2/content/base/comm/melnorme/melnorme.txt

@@ -89,7 +89,7 @@ Shall we begin trading now?
 #(WERE_NOT_AFRAID)	melnorme-010.ogg
 We reel with inchoate fear, and are thrown into a sudden panic.  
 Being peaceful by nature
-We would no doubt be unprepared for your sudden hostility
+we would no doubt be unprepared for your sudden hostility
 were it not for the excellent weapon system we bought from the Keel-Verezy just last month.
 A weapon system which is fully locked on your command bridge, by the way.
 
@@ -105,6 +105,22 @@ Yes, let us get down to business.
 
 #(HELLO_AND_DOWN_TO_BUSINESS_2)	melnorme-013.ogg
 How nice to see you again, Captain.
+Before we go on, I have a small announcement.
+As you may know, in our travels throughout the galaxy
+we Melnorme have found many strange and interesting alien artifacts.
+One of these devices is the MetaChron, a kind of trans-time alarm system.
+In a nutshell, it warns me of future dangers by predicting its own demise
+which is most likely linked to my own well being, since I keep it under my pillow.
+The unit is a small pyramid and, when all is well, white in color.
+But if we are proceeding along a timeline which will eventually result in the destruction of the MetaChron
+the unit slowly darkens. Presumably, it will be destroyed at the same time as it turns completely black.
+When we first entered this region of space, the MetaChron was white.
+Now it is light gray.
+At its present rate of change, something will destroy the MetaChron
+in the early part of the year 2159.
+In order to avoid this unpleasantness, we may be leaving just before this time
+so if you have business you wish to conduct with us
+I suggest you do so before January 2159, or February at the latest.
 
 #(HELLO_AND_DOWN_TO_BUSINESS_3)	melnorme-014.ogg
 I had itchy pods this morning, Captain, and here you are!
@@ -305,7 +321,7 @@ I don't need your help at this time. Maybe later, though.
 
 #(RESCUE_OFFER)	melnorme-045.ogg
 You have no Credit balance in our mercantile computer
-and our scanners show you that you possess no useful trade goods
+and our scanners show that you possess no useful trade goods
 but, perhaps we can work out a special deal.
 In exchange for our giving you enough fuel to
 
@@ -844,7 +860,7 @@ Actually, we don't know what the Orz did to the Androsynth -- they're just all g
 
 #(OK_BUY_ALIEN_RACE_11)	melnorme-109.ogg
 The Arilou Lalee'lay are a mysterious race of IDF beings
-IDF meaning, Inter-Dimensional Fatigue
+IDF meaning, Inter-Dimensional Fatigue.
 They do not reside in this galaxy, or in fact, anywhere in this universe.
 While it is true that the Arilou are rarely seen far from the Columbae star group
 they do make regular, secret visits to your world, and have done so for centuries.
@@ -952,8 +968,8 @@ Within a month, Dnyarri-compelled starships had spread the evil, psychic creatur
 When the Dnyarri took control over the Milieu, one race fought back -- the Taalo.
 These slow, quiet creatures were silicon-based life forms
 but bore little resemblance to the modern Chenjesu.
-The Taalo were natural immunes to the Dynarri psychic compulsion; they were unaffected by the creatures' power
-and the Dynarri would not permit anyone to exist outside their control
+The Taalo were natural immunes to the Dnyarri psychic compulsion; they were unaffected by the creatures' power
+and the Dnyarri would not permit anyone to exist outside their control
 so they ordered the remaining races of the Milieu to attack and destroy the Taalo home planet.
 This planet was one of the few Milieu worlds located in this region of space.
 I believe you call their star Delta Vulpeculae. Their home was a moon revolving about the second planet.
@@ -970,7 +986,7 @@ As the centuries of Dnyarri dominance passed, what was once the Sentient Milieu
 deteriorated and degenerated into a great galactic gulag.
 Alien races which did not serve with the efficiency and speed demanded by the Dnyarri
 were ruthlessly burned from the faces of their worlds.
-The agents of this genocide were inevitably the Dynarri's favored pet, the Ur-Quan.
+The agents of this genocide were inevitably the Dnyarri's favored pet, the Ur-Quan.
 After almost twenty-five hundred years of unrelenting Dnyarri control
 there were only four living member races of the once-great Sentient Milieu.
 By this point, the Dnyarri had used genetic manipulation to split the Ur-Quan into two sub-species:
@@ -987,7 +1003,7 @@ By this point in history, the Dnyarri had grown lax in their dominance
 and on occasion accidentally permitted their slaves moments of self-direction.
 Kzer-Za was able to use those few scattered minutes to compose a theory.
 From its observations, Kzer-Za realized that when a slave died
-the Dynarri `disconnected' from the slave's mind, lest it too be dragged down to death.
+the Dnyarri `disconnected' from the slave's mind, lest it too be dragged down to death.
 Further, the Ur-Quan scientist uncovered the fact that when a slave underwent great pain
 the Dnyarri temporarily disconnected -- but that the degree of pain had to be extreme, nearly lethal.
 Kzer-Za chose its moment carefully -- it waited until it was near an open transmission unit.

sc2/content/base/comm/pkunk/pkunk.txt

@@ -551,8 +551,7 @@ a material quaintness, if you will.
 We will be somewhat disappointed to have to leave it.
 
 #(how_goes_war)
-I seem to be having a little trouble defeating the Ur-Quan Hierarchy.
-Do you have any helpful advice for me?
+I seem to be having a little trouble defeating the Ur-Quan Hierarchy. Do you have any helpful advice for me?
 
 #(WAR_GOES_1)	pkunk-071.ogg
 Well, not advice exactly, but I can offer you plenty of moral support.

sc2/content/base/comm/shofixti/shofixti.txt

@@ -215,11 +215,11 @@ No, wait, Shofixti! I have an important duty for you to perform.
 What might that be?
 
 #(need_you_for_duty)
-Shofixti, I am now your new commander. I order you not to kill yourself.  You are to remain here and guard your solar system.
+Shofixti, I am now your new commander. I order you not to kill yourself. Instead, join our fleet. Fight with us!
 
 #(OK_WILL_BE_SENTRY)	shofixti-033.ogg
-To fight again? Against the Ur-Quan?
-Yes.  But no
+To fight again? Against the UR-QUAN!?
+YES!!...  But no.
 I cannot leave my homeworld unguarded. I will remain here and keep a solitary vigil.
 Goodbye.
 

sc2/content/base/comm/starbase/starbase.txt

@@ -1324,7 +1324,7 @@ No more history, thank you.
 The members of the old Alliance.
 
 #(what_about_hierarchy)
-The battle thralls in the Hierarchy.
+The Hierarchy and their battle thralls.
 
 #(what_about_other)
 Were there any alien races who weren't in the War?

sc2/content/base/cutscene/credits/credits.txt

@@ -61,13 +61,18 @@ MUSIC REMIXERS
 #(Music remixers)
 13 C
 Jouni Airaksinen
+András Barják
+Matt Bentley
 Tore Aune Fjellstad
 Espen Gätzschmann
 Aaron J. Grier
+A. Keren
+Casey Monroe
 Dan Nicholson
 George Nowik
 Riku Nuottajärvi
 Erol Otus
+Greg Szymanski
  
 #(Other contrib caption)
 13 C

sc2/content/base/gamestrings.txt

@@ -1,4 +1,4 @@
-#(Vega)
+#(Vega) -- STAR_STRING_BASE
 Vega
 
 
@@ -530,7 +530,7 @@ Lentilis
 UNKNOWN
 
 
-#(devices)
+#(devices) -- DEVICE_STRING_BASE
 devices
 
 
@@ -646,7 +646,7 @@ Glowing Rod
 Moon Base
 
 
-#(cargo)
+#(cargo) -- CARGO_STRING_BASE
 cargo
 
 
@@ -686,7 +686,7 @@ Radioactive
 Exotic
 
 
-#(Hydrogen)
+#(Hydrogen) -- ELEMENTS_STRING_BASE
 Hydrogen
 
 
@@ -1218,7 +1218,7 @@ Calcium Compounds
 Nitric Acid
 
 
-#(MINERAL SCAN)
+#(MINERAL SCAN) -- SCAN_STRING_BASE
 MINERAL SCAN
 
 
@@ -1442,7 +1442,7 @@ World
 Gas Giant
 
 
-#(Alpha)
+#(Alpha) -- STAR_NUMBER_BASE
 Alpha
 
 
@@ -1498,7 +1498,7 @@ Nu
 Xi
 
 
-#(Mercury)
+#(Mercury) -- PLANET_NUMBER_BASE
 Mercury
 
 
@@ -1625,10 +1625,12 @@ Planet XV
 #(Planet XVI)
 Planet XVI
 
+
 #(Sa-Matra)
 Sa-Matra
 
-#(JAN)
+
+#(JAN) -- MONTHS_STRING_BASE
 JAN
 
 
@@ -1676,7 +1678,7 @@ NOV
 DEC
 
 
-#((In response to your statement))
+#((In response to your statement)) -- FEEDBACK_STRING_BASE
 (In response to your statement)
 
 
@@ -1684,7 +1686,7 @@ DEC
 MORE
 
 
-#(Starbase)
+#(Starbase) -- STARBASE_STRING_BASE
 Starbase
 
 
@@ -1704,7 +1706,7 @@ Shipyard
 Depart StarBase
 
 
-#(ENCOUNTER IN)
+#(ENCOUNTER IN) -- ENCOUNTER_STRING_BASE
 ENCOUNTER IN
 
 
@@ -1736,7 +1738,7 @@ Debris
 Scavenged
 
 
-#(HyperSpace)
+#(HyperSpace) -- NAVIGATION_STRING_BASE
 HyperSpace
 
 
@@ -1760,7 +1762,7 @@ Fuel:
 Fuel Use:
 
 
-#(Enter name)
+#(Enter name) -- NAMING_STRING_BASE
 Enter name
 
 
@@ -1776,7 +1778,7 @@ Vindicator
 Zelnick
 
 
-#(Empty)
+#(Empty) -- MELEE_STRING_BASE
 Empty
 
 
@@ -1812,7 +1814,7 @@ Behemoth Zenith
 The Peeled Eyes
 
 
-#(Saving . . .)
+#(Saving . . .) -- SAVEGAME_STRING_BASE
 Saving . . .
 
 
@@ -1832,7 +1834,7 @@ Empty Slot
 Saved Game - Date:
 
 
-#(Sound)
+#(Sound) -- OPTION_STRING_BASE
 Sound
 
 
@@ -1852,7 +1854,7 @@ OFF
 ON
 
 
-#(Really Quit)
+#(Really Quit) -- QUITMENU_STRING_BASE
 Really Quit?
 
 
@@ -1864,7 +1866,7 @@ Yes
 No
 
 
-#(Cr)
+#(Cr) -- STATUS_STRING_BASE
 Cr
 
 
@@ -1888,7 +1890,7 @@ CREW
 CAPTAIN
 
 
-#(nose:)
+#(nose:) -- FLAGSHIP_STRING_BASE
 nose:
 
 
@@ -1940,7 +1942,7 @@ n/a
 none
 
 
-#(Orbit: )
+#(Orbit: ) -- ORBITSCAN_STRING_BASE
 Orbit: 
 
 
@@ -2016,7 +2018,7 @@ Day:
 Tilt: 
 
 
-#(scan)
+#(scan) -- MAINMENU_STRING_BASE
 scan
 
 
@@ -2237,7 +2239,7 @@ Use the keyboard or joystick instead.
 
 Please press ENTER or SPACE to return.
 
-#(Unconnected. Press LEFT to connect.)
+#(Unconnected. Press LEFT to connect.) -- NETMELEE_STRING_BASE
 Unconnected. Press LEFT to connect.
 
 

sc2/content/base/ui/setupmenu.txt

@@ -30,10 +30,12 @@ Positional Audio
 Sound Driver
 Sound Quality
 Slave Shields
-Player One
-Player Two
+Bottom Player
+Top Player
 Control Set
 UQM Remixes
+Speech
+Aspect Ratio
 
 #(CAT_0_OPTS)
 320x240
@@ -314,28 +316,28 @@ Placeholder
 Placeholder
 
 #(CAT_18_OPT_0_DESC)
-Player 1 controls the bottom player in
-Super Melee, and the entire Full Game.
+Controls the bottom player in Super
+Melee, and the entire Full Game.
 
 #(CAT_18_OPT_1_DESC)
-Player 1 controls the bottom player in
-Super Melee, and the entire Full Game.
+Controls the bottom player in Super
+Melee, and the entire Full Game.
 
 #(CAT_18_OPT_2_DESC)
-Player 1 controls the bottom player in
-Super Melee, and the entire Full Game.
+Controls the bottom player in Super
+Melee, and the entire Full Game.
 
 #(CAT_18_OPT_3_DESC)
-Player 1 controls the bottom player in
-Super Melee, and the entire Full Game.
+Controls the bottom player in Super
+Melee, and the entire Full Game.
 
 #(CAT_18_OPT_4_DESC)
-Player 1 controls the bottom player in
-Super Melee, and the entire Full Game.
+Controls the bottom player in Super
+Melee, and the entire Full Game.
 
 #(CAT_18_OPT_5_DESC)
-Player 1 controls the bottom player in
-Super Melee, and the entire Full Game.
+Controls the bottom player in Super
+Melee, and the entire Full Game.
 
 #(CAT_19_OPTS)
 Placeholder
@@ -346,27 +348,27 @@ Placeholder
 Placeholder
 
 #(CAT_19_OPT_0_DESC)
-Player 2 controls the top player
+Controls the top player
 in Super Melee.
 
 #(CAT_19_OPT_1_DESC)
-Player 2 controls the top player
+Controls the top player
 in Super Melee.
 
 #(CAT_19_OPT_2_DESC)
-Player 2 controls the top player
+Controls the top player
 in Super Melee.
 
 #(CAT_19_OPT_3_DESC)
-Player 2 controls the top player
+Controls the top player
 in Super Melee.
 
 #(CAT_19_OPT_4_DESC)
-Player 2 controls the top player
+Controls the top player
 in Super Melee.
 
 #(CAT_19_OPT_5_DESC)
-Player 2 controls the top player
+Controls the top player
 in Super Melee.
 
 #(CAT_20_OPTS)
@@ -420,10 +422,39 @@ Overrides PC or 3do soundtrack with the
 modern soundtrack written by The Precursors.
 Requires a restart of UQM to take effect.
 
+#(CAT_22_OPTS)
+Disabled
+Enabled
+
+#(CAT_22_OPT_0_DESC)
+Do not load the 3DO Speech Pack.
+Uses script closer to PC version.
+Requires a restart of UQM to take effect.
+
+#(CAT_22_OPT_1_DESC)
+Use 3DO speech. The script is closer to 3DO
+version where there are differences.
+Requires a restart of UQM to take effect.
+
+#(CAT_23_OPTS)
+Any
+Force 4:3
+
+#(CAT_23_OPT_0_DESC)
+Allow any aspect ratio. The game may be
+stretched in windows that are not 4:3.
+Currently only meaningful in OpenGL mode.
+
+#(CAT_23_OPT_1_DESC)
+Display the game with 4:3 aspect even when
+the window is not.
+Currently only meaningful in OpenGL mode.
+
 #(SLIDERS)
 Music Volume
 SFX Volume
 Speech Volume
+Gamma Correction
 
 #(SLIDER_0_DESC)
 Sets the music volume.
@@ -434,6 +465,10 @@ Sets the sound effects volume.
 #(SLIDER_2_DESC)
 Sets the speech volume.
 
+#(SLIDER_3_DESC)
+Sets the gamma correction.
+May not work on all hardware.
+
 #(BUTTONS)
 Quit Setup Menu
 Return to Main Menu