diff --git a/ChangeLog b/ChangeLog
index cfebe4fa8f..88bbcf5970 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2006-01-20  Thomas Vander Stichele  <thomas at apestaart dot org>
+
+	* ext/dvdnav/dvdnavsrc.c: (if):
+	* ext/dvdread/stream_labels.c:
+	* gst/asfdemux/gstasfdemux.c: (gst_asf_demux_process_segment):
+	* gst/realmedia/rmdemux.c: (gst_rmdemux_loop):
+	  fix up error domains, error strings, and use of translation
+	* po/POTFILES.in:
+	  fix up this file, even though none of them are actually marked
+	  for build yet.
+
 2006-01-19  Martin Soto  <martinsoto@users.sourceforge.net>
 
 	* gst/mpegstream/gstmpegparse.h (struct _GstMPEGParse): 
diff --git a/ext/dvdnav/dvdnavsrc.c b/ext/dvdnav/dvdnavsrc.c
index b22bfa616a..e9accb9240 100644
--- a/ext/dvdnav/dvdnavsrc.c
+++ b/ext/dvdnav/dvdnavsrc.c
@@ -53,11 +53,10 @@ GST_DEBUG_CATEGORY_STATIC (dvdnavsrc_debug);
 #define DVDNAV_RAWCALL(func, params, elem, action) \
   if (func params != DVDNAV_STATUS_OK) { \
     GST_ELEMENT_ERROR (elem, LIBRARY, FAILED, \
-                       (_("Error invoking \"%s\": %s."), \
-                        #func, dvdnav_err_to_string ((elem)->dvdnav)), \
-                       GST_ERROR_SYSTEM); \
-    action \
-  }
+                       (_("Library call failed.")), \
+                       ("Error invoking \"%s\": %s.", \
+                        #func, dvdnav_err_to_string ((elem)->dvdnav)));
+action}
 
 /* Call a dvdnav function and, it it fails, report an error and return
    from the current procedure. */
@@ -1527,7 +1526,7 @@ dvdnavsrc_open (DVDNavSrc * src)
   g_return_val_if_fail (src->location != NULL, FALSE);
 
   if (dvdnav_open (&src->dvdnav, (char *) src->location) != DVDNAV_STATUS_OK) {
-    GST_ELEMENT_ERROR (src, LIBRARY, FAILED,
+    GST_ELEMENT_ERROR (src, RESOURCE, OPEN_READ,
         (_("Failed to open DVD device '%s'."), src->location),
         GST_ERROR_SYSTEM);
     return FALSE;
diff --git a/ext/dvdread/stream_labels.c b/ext/dvdread/stream_labels.c
index 32afe0a36e..a2e59b5bcc 100644
--- a/ext/dvdread/stream_labels.c
+++ b/ext/dvdread/stream_labels.c
@@ -23,7 +23,7 @@
 
 #include "dvdreadsrc.h"
 #include "stream_labels.h"
-#include "gst/gst-i18n-plugin.h"
+#include <gst/gst-i18n-plugin.h>
 
 GHashTable *
 dvdreadsrc_init_languagelist (void)
diff --git a/gst/asfdemux/gstasfdemux.c b/gst/asfdemux/gstasfdemux.c
index e8eb8aae81..060123d9ff 100644
--- a/gst/asfdemux/gstasfdemux.c
+++ b/gst/asfdemux/gstasfdemux.c
@@ -26,6 +26,8 @@
 #include <gst/riff/riff-media.h>
 #include <string.h>
 
+#include <gst/gst-i18n-plugin.h>
+
 #include "gstasfdemux.h"
 #include "asfheaders.h"
 
@@ -928,8 +930,8 @@ gst_asf_demux_process_segment (GstASFDemux * asf_demux,
       if (segment_info.chunk_size < frag_size)
         frag_size -= segment_info.chunk_size + 1;
       else {
-        GST_ELEMENT_ERROR (asf_demux, STREAM, TOO_LAZY,
-            ("Invalid data in stream"),
+        GST_ELEMENT_ERROR (asf_demux, STREAM, DEMUX,
+            (_("Invalid data in stream")),
             ("Invalid fragment size indicator in segment"));
         return FALSE;
       }
diff --git a/gst/realmedia/rmdemux.c b/gst/realmedia/rmdemux.c
index a27998b97f..0dec3eaf5b 100644
--- a/gst/realmedia/rmdemux.c
+++ b/gst/realmedia/rmdemux.c
@@ -876,11 +876,9 @@ need_pause:
     gst_pad_pause_task (pad);
     if (GST_FLOW_IS_FATAL (ret)) {
       gst_rmdemux_send_event (rmdemux, gst_event_new_eos ());
-      /* FIXME: add translations */
       if (ret != GST_FLOW_UNEXPECTED) {
-        GST_ELEMENT_ERROR (rmdemux, STREAM, FAILED,
-            (("Internal data stream error.")),
-            ("stream stopped, reason %d", ret));
+        GST_ELEMENT_ERROR (rmdemux, CORE, EVENT, (NULL),
+            ("gst_rmdemux_send_event() failed with return value %d", ret));
       }
     }
     return;
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 24a3d80174..f24d052e13 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -1 +1,6 @@
-gst/realmedia/rmdemux.c
+# not activated yet:
+# ext/dvdread/stream_labels.c
+# ext/dvdnav/dvdnavsrc.c
+
+# not activated yet:
+# gst/asfdemux/gstasfdemux.c