Merge from HEADdevel

2 files changed, 8 insertions, 0 deletions

diff --git a/ChangeLog b/ChangeLog
index e1b4893d..39272bd8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2005-07-21  Danilo Šegan  <danilo@gnome.org>
+
+	Fixes #149925.
+	
+	* src/vte.c (vte_terminal_io_read): Added simple comment for 
+	translators.
+
 2005-07-07  Matthias Clasen  <mclasen@redhat.com>
 
 	* src/vte.c (vte_terminal_unrealize): Unset the user data
diff --git a/src/vte.c b/src/vte.c
index ea7d9fac..b76dcd93 100644
--- a/src/vte.c
+++ b/src/vte.c
@@ -7901,6 +7901,7 @@ vte_terminal_io_read(GIOChannel *channel,
 			case EBUSY: /* do nothing */
 				break;
 			default:
+				/* Translators: %s is replaced with error message returned by strerror(). */
 				g_warning(_("Error reading from child: "
 					    "%s."), strerror(errno));
 				leave_open = TRUE;