Due for a merge.

Docs/Changelog_sm5.txt

@@ -9,6 +9,11 @@ ________________________________________________________________________________
 StepMania 5.0 alpha 2 | 201204??
 --------------------------------------------------------------------------------
 
+2012/04/08
+----------
+* [ScreenNetworkOptions] Fixed a bug where localized text would not show up
+  properly. Fixes issue 759. [AJ]
+
 2012/04/06
 ----------
 * Modify Jousway's planned noteskin to allow it to work with Technomotion

src/PlayerStageStats.cpp

@@ -761,6 +761,12 @@ public:
 		return 0;
 	}
   
+  static int FailPlayer( T* p, lua_State *L )
+  {
+    p->m_bFailed = true;
+    return 0;
+  }
+
 	LunaPlayerStageStats()
 	{
 		ADD_METHOD( GetCaloriesBurned );
@@ -801,6 +807,7 @@ public:
 		ADD_METHOD( SetScore );
 		ADD_METHOD( GetCurMaxScore );
 		ADD_METHOD( SetCurMaxScore );
+    ADD_METHOD( FailPlayer );
 	}
 };
 

src/ScreenNetworkOptions.cpp

@@ -52,6 +52,7 @@ void ScreenNetworkOptions::Init()
 		vHands.push_back( pHand );
 		pHand->m_Def.m_sName = "Connection";
 		pHand->m_Def.m_bOneChoiceForAllPlayers = true;
+		pHand->m_Def.m_bAllowThemeItems = false;
 		if ( NSMAN->useSMserver )
 			pHand->m_Def.m_vsChoices.push_back(CLIENT_DISCONNECT);
 		else
@@ -63,6 +64,7 @@ void ScreenNetworkOptions::Init()
 		pHand->m_Def.m_sName = "Scoreboard";
 		pHand->m_Def.m_vsChoices.clear();
 		pHand->m_Def.m_bOneChoiceForAllPlayers = true;
+		pHand->m_Def.m_bAllowThemeItems = false;
 		pHand->m_Def.m_vsChoices.push_back(SCORE_OFF);
 		pHand->m_Def.m_vsChoices.push_back(SCORE_ON);
 	}

src/arch/Sound/ALSA9Helpers.cpp

@@ -130,7 +130,7 @@ static RString DeviceName()
 {
 	if( !PREFSMAN->m_iSoundDevice.Get().empty() )
 		return PREFSMAN->m_iSoundDevice;
-	return "hw:0";
+	return "default";
 }
 
 void Alsa9Buf::GetSoundCardDebugInfo()