--- a/src/xmms-sid.c	Sat Dec 30 07:40:05 2006 +0000
+++ b/src/xmms-sid.c	Sun Dec 31 21:43:04 2006 +0000
@@ -198,13 +198,13 @@
 	/* Initialize song-length database */
 	xs_songlen_close();
 	if (xs_cfg.songlenDBEnable && (xs_songlen_init() != 0)) {
-		xs_error("Error initializing song-length database!\n");
+		xs_error(_("Error initializing song-length database!\n"));
 	}
 
 	/* Initialize STIL database */
 	xs_stil_close();
 	if (xs_cfg.stilDBEnable && (xs_stil_init() != 0)) {
-		xs_error("Error initializing STIL database!\n");
+		xs_error(_("Error initializing STIL database!\n"));
 	}
 }
 
@@ -316,14 +316,14 @@
 	/* Allocate audio buffer */
 	audioBuffer = (gchar *) g_malloc(XS_AUDIOBUF_SIZE);
 	if (audioBuffer == NULL) {
-		xs_error("Couldn't allocate memory for audio data buffer!\n");
+		xs_error(_("Couldn't allocate memory for audio data buffer!\n"));
 		goto xs_err_exit;
 	}
 
 	if (myStatus.oversampleEnable) {
 		oversampleBuffer = (gchar *) g_malloc(XS_AUDIOBUF_SIZE * myStatus.oversampleFactor);
 		if (oversampleBuffer == NULL) {
-			xs_error("Couldn't allocate memory for audio oversampling buffer!\n");
+			xs_error(_("Couldn't allocate memory for audio oversampling buffer!\n"));
 			goto xs_err_exit;
 		}
 	}
@@ -400,7 +400,7 @@
 
 		/* Initialize song */
 		if (!myStatus.sidPlayer->plrInitSong(&myStatus)) {
-			xs_error("Couldn't initialize SID-tune '%s' (sub-tune #%i)!\n",
+			xs_error(_("Couldn't initialize SID-tune '%s' (sub-tune #%i)!\n"),
 			      myTune->sidFilename, myStatus.currSong);
 			goto xs_err_exit;
 		}
@@ -412,8 +412,10 @@
 		
 		if (!xs_plugin_ip.output->
 		    open_audio(myStatus.audioFormat, myStatus.audioFrequency, myStatus.audioChannels)) {
-			xs_error("Couldn't open XMMS audio output (fmt=%x, freq=%i, nchan=%i)!\n", myStatus.audioFormat,
-			      myStatus.audioFrequency, myStatus.audioChannels);
+			xs_error(_("Couldn't open XMMS audio output (fmt=%x, freq=%i, nchan=%i)!\n"),
+				myStatus.audioFormat,
+				myStatus.audioFrequency,
+				myStatus.audioChannels);
 
 			XS_MUTEX_LOCK(xs_status);
 			xs_status.isError = TRUE;
@@ -451,7 +453,7 @@
 				/* Execute rate-conversion with filtering */
 				if (xs_filter_rateconv(audioBuffer, oversampleBuffer,
 						       myStatus.audioFormat, myStatus.oversampleFactor, audioGot) < 0) {
-					xs_error("Oversampling rate-conversion pass failed.\n");
+					xs_error(_("Oversampling rate-conversion pass failed.\n"));
 					XS_MUTEX_LOCK(xs_status);
 					xs_status.isError = TRUE;
 					XS_MUTEX_UNLOCK(xs_status);
@@ -567,7 +569,7 @@
 
 	/* Start the playing thread! */
 	if (pthread_create(&xs_decode_thread, NULL, xs_playthread, NULL) < 0) {
-		xs_error("Couldn't start playing thread!\n");
+		xs_error(_("Couldn't create playing thread!\n"));
 		xs_tuneinfo_free(xs_status.tuneInfo);
 		xs_status.tuneInfo = NULL;
 		xs_status.sidPlayer->plrDeleteSID(&xs_status);
@@ -764,7 +766,7 @@
 	gtk_widget_set_name(xs_subctrl, "xs_subctrl");
 	gtk_object_set_data(GTK_OBJECT(xs_subctrl), "xs_subctrl", xs_subctrl);
 
-	gtk_window_set_title(GTK_WINDOW(xs_subctrl), "Subtune Control");
+	gtk_window_set_title(GTK_WINDOW(xs_subctrl), _("Subtune Control"));
 	gtk_window_set_position(GTK_WINDOW(xs_subctrl), GTK_WIN_POS_MOUSE);
 	gtk_container_set_border_width(GTK_CONTAINER(xs_subctrl), 0);
 	gtk_window_set_policy(GTK_WINDOW(xs_subctrl), FALSE, FALSE, FALSE);
@@ -959,13 +961,15 @@
 	/* Allocate structure */
 	pResult = (t_xs_tuneinfo *) g_malloc0(sizeof(t_xs_tuneinfo));
 	if (!pResult) {
-		xs_error("Could not allocate memory for t_xs_tuneinfo ('%s')\n", pcFilename);
+		xs_error(_("Could not allocate memory for t_xs_tuneinfo ('%s')\n"),
+			pcFilename);
 		return NULL;
 	}
 
 	pResult->sidFilename = g_strdup(pcFilename);
 	if (!pResult->sidFilename) {
-		xs_error("Could not allocate sidFilename ('%s')\n", pcFilename);
+		xs_error(_("Could not allocate sidFilename ('%s')\n"),
+			pcFilename);
 		g_free(pResult);
 		return NULL;
 	}
@@ -973,7 +977,7 @@
 	/* Allocate space for subtune information */
 	pResult->subTunes = g_malloc0(sizeof(t_xs_subtuneinfo) * (nsubTunes + 1));
 	if (!pResult->subTunes) {
-		xs_error("Could not allocate memory for t_xs_subtuneinfo ('%s', %i)\n",
+		xs_error(_("Could not allocate memory for t_xs_subtuneinfo ('%s', %i)\n"),
 			pcFilename, nsubTunes);
 
 		g_free(pResult->sidFilename);