--- a/src/xs_sidplay2.cc	Mon Jan 08 12:07:05 2007 +0000
+++ b/src/xs_sidplay2.cc	Mon Jan 08 12:08:05 2007 +0000
@@ -86,7 +86,7 @@
 	/* Initialize the engine */
 	myEngine->currEng = new sidplay2;
 	if (!myEngine->currEng) {
-		xs_error("Could not initialize libSIDPlay2 emulation engine\n");
+		xs_error(_("Could not initialize libSIDPlay2 emulation engine (object allocation/constructor failed)\n"));
 		return FALSE;
 	}
 
@@ -199,13 +199,13 @@
 			/* Builder object created, initialize it */
 			rs->create((myEngine->currEng->info()).maxsids);
 			if (!*rs) {
-				xs_error("rs->create() failed.\n");
+				xs_error(_("reSID->create() failed.\n"));
 				return FALSE;
 			}
 
 			rs->filter(xs_cfg.emulateFilters);
 			if (!*rs) {
-				xs_error("rs->filter(%d) failed.\n", xs_cfg.emulateFilters);
+				xs_error(_("reSID->filter(%d) failed.\n"), xs_cfg.emulateFilters);
 				return FALSE;
 			}
 
@@ -213,14 +213,14 @@
 			// ... WHEN/IF resid-builder+libsidplay2 gets fixed
 			rs->sampling(tmpFreq);
 			if (!*rs) {
-				xs_error("rs->sampling(%d) failed.\n", tmpFreq);
+				xs_error(_("reSID->sampling(%d) failed.\n"), tmpFreq);
 				return FALSE;
 			}
 
 			// FIXME FIX ME: load filter spec
 			rs->filter((sid_filter_t *) NULL);
 			if (!*rs) {
-				xs_error("rs->filter(NULL) failed.\n");
+				xs_error(_("reSID->filter(NULL) failed.\n"));
 				return FALSE;
 			}
 		}
@@ -234,13 +234,13 @@
 			/* Builder object created, initialize it */
 			hs->create((myEngine->currEng->info()).maxsids);
 			if (!*hs) {
-				xs_error("hs->create() failed.\n");
+				xs_error(_("hardSID->create() failed.\n"));
 				return FALSE;
 			}
 
 			hs->filter(xs_cfg.emulateFilters);
 			if (!*hs) {
-				xs_error("hs->filter(%d) failed.\n", xs_cfg.emulateFilters);
+				xs_error(_("hardSID->filter(%d) failed.\n"), xs_cfg.emulateFilters);
 				return FALSE;
 			}
 		}
@@ -248,7 +248,7 @@
 #endif
 
 	if (!myEngine->currBuilder) {
-		xs_error("Could not initialize SIDBuilder object.\n");
+		xs_error(_("Could not initialize SIDBuilder object.\n"));
 		return FALSE;
 	}
 
@@ -262,7 +262,8 @@
 		break;
 
 	default:
-		xs_error("Invalid clockSpeed=%d, falling back to PAL.\n", xs_cfg.clockSpeed);
+		xs_error(_("Invalid clockSpeed=%d, falling back to PAL.\n"),
+			xs_cfg.clockSpeed);
 
 	case XS_CLOCK_PAL:
 		myEngine->currConfig.clockDefault = SID2_CLOCK_PAL;
@@ -285,7 +286,7 @@
 	if ((xs_cfg.sid2OptLevel >= 0) && (xs_cfg.sid2OptLevel <= SID2_MAX_OPTIMISATION))
 		myEngine->currConfig.optimisation = xs_cfg.sid2OptLevel;
 	else {
-		xs_error("Invalid sid2OptLevel=%d, falling back to %d.\n",
+		xs_error(_("Invalid sid2OptLevel=%d, falling back to %d.\n"),
 			xs_cfg.sid2OptLevel, SID2_DEFAULT_OPTIMISATION);
 		
 		xs_cfg.sid2OptLevel =
@@ -308,14 +309,14 @@
 
 	/* Now set the emulator configuration */
 	if (myEngine->currEng->config(myEngine->currConfig) < 0) {
-		xs_error("Emulator engine configuration failed!\n");
+		xs_error(_("[SIDPlay2] Emulator engine configuration failed!\n"));
 		return FALSE;
 	}
 
 	/* Create the sidtune */
 	myEngine->currTune = new SidTune(0);
 	if (!myEngine->currTune) {
-		xs_error("Could not initialize SIDTune object.\n");
+		xs_error(_("[SIDPlay2] Could not initialize SIDTune object.\n"));
 		return FALSE;
 	}
 
@@ -366,14 +367,16 @@
 	if (!myEngine) return FALSE;
 
 	if (!myEngine->currTune->selectSong(myStatus->currSong)) {
-		xs_error("currTune->selectSong() failed\n");
+		xs_error(_("[SIDPlay2] currTune->selectSong() failed\n"));
 		return FALSE;
 	}
 
 	if (myEngine->currEng->load(myEngine->currTune) < 0) {
-		xs_error("currEng->load() failed\n");
+		xs_error(_("[SIDPlay2] currEng->load() failed\n"));
 		return FALSE;
 	}
+	
+	myEngine->isInitialized = TRUE;
 
 	return TRUE;
 }
@@ -402,6 +405,8 @@
 
 	myEngine = (t_xs_sidplay2 *) myStatus->sidEngine;
 	if (!myEngine) return FALSE;
+	
+	myEngine->isInitialized = FALSE;
 
 	/* Try to get the tune */
 	if (!pcFilename) return FALSE;