diff --git a/gio/ChangeLog b/gio/ChangeLog
index c763c9e97..ff898dea8 100644
--- a/gio/ChangeLog
+++ b/gio/ChangeLog
@@ -1,3 +1,11 @@
+2008-01-25  Matthias Clasen  <mclasen@redhat.com>
+
+	* ginputstream.c:
+	* goutputstream.c:
+	* gbufferedinputstream.c:
+	* glocalfile.c: String improvements.  (#511966, 
+	 Theppitak Karoonboonyanan)
+
 2008-01-24  Matthias Clasen  <mclasen@redhat.com>
 
 	* gioscheduler.h: Expand docs a bit.
diff --git a/gio/gbufferedinputstream.c b/gio/gbufferedinputstream.c
index 6cc537ed4..f011be589 100644
--- a/gio/gbufferedinputstream.c
+++ b/gio/gbufferedinputstream.c
@@ -480,7 +480,8 @@ g_buffered_input_stream_fill_async (GBufferedInputStream *stream,
 					   callback,
 					   user_data,
 					   G_IO_ERROR, G_IO_ERROR_INVALID_ARGUMENT,
-					   _("Too large count value passed to g_input_stream_read_async"));
+					   _("Too large count value passed to %s"),
+					   G_GNUC_PRETTY_FUNCTION);
       return;
     }
   
diff --git a/gio/ginputstream.c b/gio/ginputstream.c
index 33497a9bc..5c0da3766 100644
--- a/gio/ginputstream.c
+++ b/gio/ginputstream.c
@@ -183,7 +183,8 @@ g_input_stream_read  (GInputStream  *stream,
   if (((gssize) count) < 0)
     {
       g_set_error (error, G_IO_ERROR, G_IO_ERROR_INVALID_ARGUMENT,
-		   _("Too large count value passed to g_input_stream_read"));
+		   _("Too large count value passed to %s"), 
+                   G_GNUC_PRETTY_FUNCTION);
       return -1;
     }
 
@@ -315,7 +316,8 @@ g_input_stream_skip (GInputStream  *stream,
   if (((gssize) count) < 0)
     {
       g_set_error (error, G_IO_ERROR, G_IO_ERROR_INVALID_ARGUMENT,
-		   _("Too large count value passed to g_input_stream_skip"));
+		   _("Too large count value passed to %s"),
+		   G_GNUC_PRETTY_FUNCTION);
       return -1;
     }
   
@@ -556,7 +558,8 @@ g_input_stream_read_async (GInputStream        *stream,
 					   callback,
 					   user_data,
 					   G_IO_ERROR, G_IO_ERROR_INVALID_ARGUMENT,
-					   _("Too large count value passed to g_input_stream_read_async"));
+					   _("Too large count value passed to %s"),
+					   G_GNUC_PRETTY_FUNCTION);
       return;
     }
 
@@ -680,7 +683,8 @@ g_input_stream_skip_async (GInputStream        *stream,
 					   callback,
 					   user_data,
 					   G_IO_ERROR, G_IO_ERROR_INVALID_ARGUMENT,
-					   _("Too large count value passed to g_input_stream_skip_async"));
+					   _("Too large count value passed to %s"),
+					   G_GNUC_PRETTY_FUNCTION);
       return;
     }
 
diff --git a/gio/glocalfile.c b/gio/glocalfile.c
index ae856b62c..29b189125 100644
--- a/gio/glocalfile.c
+++ b/gio/glocalfile.c
@@ -1626,7 +1626,7 @@ g_local_file_trash (GFile         *file,
       
       g_set_error (error, G_IO_ERROR,
 		   g_io_error_from_errno (errno),
-		   _("Unable to create trashed file: %s"),
+		   _("Unable to create trashing info file: %s"),
 		   g_strerror (errno));
       return FALSE;
     }
diff --git a/gio/goutputstream.c b/gio/goutputstream.c
index bf9e82a26..c1bb8b20b 100644
--- a/gio/goutputstream.c
+++ b/gio/goutputstream.c
@@ -190,7 +190,8 @@ g_output_stream_write (GOutputStream  *stream,
   if (((gssize) count) < 0)
     {
       g_set_error (error, G_IO_ERROR, G_IO_ERROR_INVALID_ARGUMENT,
-		   _("Too large count value passed to g_output_stream_write"));
+		   _("Too large count value passed to %s"),
+		   G_GNUC_PRETTY_FUNCTION);
       return -1;
     }
 
@@ -644,7 +645,8 @@ g_output_stream_write_async (GOutputStream       *stream,
 					   callback,
 					   user_data,
 					   G_IO_ERROR, G_IO_ERROR_INVALID_ARGUMENT,
-					   _("Too large count value passed to g_output_stream_write_async"));
+					   _("Too large count value passed to %s"),
+					   G_GNUC_PRETTY_FUNCTION);
       return;
     }