diff --git a/gtk/gtkbuilder.c b/gtk/gtkbuilder.c
index 9dff20e..3738a86 100644
--- a/gtk/gtkbuilder.c
+++ b/gtk/gtkbuilder.c
@@ -1221,7 +1221,7 @@ gtk_builder_value_from_string_type (GtkBuilder   *builder,
 	    g_set_error (error,
 			 GTK_BUILDER_ERROR,
 			 GTK_BUILDER_ERROR_INVALID_VALUE,
-			 "Could not parse integer `%s'",
+			 _("Could not parse integer `%s'"),
 			 string);
             ret = FALSE;
             break;
@@ -1244,7 +1244,7 @@ gtk_builder_value_from_string_type (GtkBuilder   *builder,
 	    g_set_error (error,
 			 GTK_BUILDER_ERROR,
 			 GTK_BUILDER_ERROR_INVALID_VALUE,
-			 "Could not parse unsigned integer `%s'",
+			 _("Could not parse unsigned integer `%s'"),
 			 string);
             ret = FALSE;
             break;
@@ -1290,7 +1290,7 @@ gtk_builder_value_from_string_type (GtkBuilder   *builder,
 	    g_set_error (error,
 			 GTK_BUILDER_ERROR,
 			 GTK_BUILDER_ERROR_INVALID_VALUE,
-			 "Could not parse double `%s'",
+			 _("Could not parse double `%s'"),
 			 string);
             ret = FALSE;
             break;
@@ -1318,7 +1318,7 @@ gtk_builder_value_from_string_type (GtkBuilder   *builder,
 	      g_set_error (error,
 			   GTK_BUILDER_ERROR,
 			   GTK_BUILDER_ERROR_INVALID_VALUE,
-			   "Could not parse color `%s'",
+			   _("Could not parse color `%s'"),
 			   string);
               ret = FALSE;
             }
@@ -1333,7 +1333,7 @@ gtk_builder_value_from_string_type (GtkBuilder   *builder,
           g_set_error (error,
                        GTK_BUILDER_ERROR,
                        GTK_BUILDER_ERROR_INVALID_VALUE,
-                       "Could not parse '%s' as a %s",
+                       _("Could not parse `%s' as a %s"),
                        string, G_VALUE_TYPE_NAME (value));
           ret = FALSE;
         }
@@ -1350,8 +1350,8 @@ gtk_builder_value_from_string_type (GtkBuilder   *builder,
               g_set_error (error,
                            GTK_BUILDER_ERROR,
                            GTK_BUILDER_ERROR_INVALID_VALUE,
-                           "Could not load image '%s': "
-                           " '%s' is already used as object id",
+                           _("Could not load image `%s': "
+                           " `%s' is already used as object id"),
                            string, string);
               return FALSE;
             }
@@ -1363,7 +1363,7 @@ gtk_builder_value_from_string_type (GtkBuilder   *builder,
             {
               GtkIconTheme *theme;
 
-              g_warning ("Could not load image '%s': %s", 
+              g_warning ("Could not load image `%s': %s", 
                          string, tmp_error->message);
               g_error_free (tmp_error);
 
@@ -1393,7 +1393,7 @@ gtk_builder_value_from_string_type (GtkBuilder   *builder,
       g_set_error (error,
 		   GTK_BUILDER_ERROR,
 		   GTK_BUILDER_ERROR_INVALID_VALUE,
-		   "Unsupported GType `%s'",
+		   _("Unsupported GType `%s'"),
 		   g_type_name (type));
       ret = FALSE;
       break;
@@ -1436,7 +1436,7 @@ _gtk_builder_enum_from_string (GType         type,
 	  g_set_error (error,
 		       GTK_BUILDER_ERROR,
 		       GTK_BUILDER_ERROR_INVALID_VALUE,
-		       "Could not parse enum: `%s'",
+		       _("Could not parse enum: `%s'"),
 		       string);
 	  ret = FALSE;
 	}
@@ -1525,7 +1525,7 @@ _gtk_builder_flags_from_string (GType         type,
 		  g_set_error (error,
 			       GTK_BUILDER_ERROR,
 			       GTK_BUILDER_ERROR_INVALID_VALUE,
-			       "Unknown flag: `%s'",
+			       _("Unknown flag: `%s'"),
 			       flag);
 		  ret = FALSE;
 		  break;
diff --git a/gtk/gtkbuilderparser.c b/gtk/gtkbuilderparser.c
index b4f6855..f238655 100644
--- a/gtk/gtkbuilderparser.c
+++ b/gtk/gtkbuilderparser.c
@@ -81,7 +81,8 @@ error_missing_attribute (ParserData *data,
   g_set_error (error,
                GTK_BUILDER_ERROR,
                GTK_BUILDER_ERROR_MISSING_ATTRIBUTE,
-               "%s:%d:%d <%s> requires attribute \"%s\"",
+	       /* filename:line:row <xml-tag> "attribute" */
+               _("%s:%d:%d <%s> requires attribute \"%s\""),
                data->filename,
                line_number, char_number, tag, attribute);
 }
@@ -101,7 +102,8 @@ error_invalid_attribute (ParserData *data,
   g_set_error (error,
                GTK_BUILDER_ERROR,
                GTK_BUILDER_ERROR_INVALID_ATTRIBUTE,
-               "%s:%d:%d '%s' is not a valid attribute of <%s>",
+	       /* filename:line:row 'attribute' <xml-tag> */
+               _("%s:%d:%d '%s' is not a valid attribute of <%s>"),
                data->filename,
                line_number, char_number, attribute, tag);
 }
@@ -122,14 +124,16 @@ error_invalid_tag (ParserData *data,
     g_set_error (error,
 		 GTK_BUILDER_ERROR,
 		 GTK_BUILDER_ERROR_INVALID_TAG,
-		 "%s:%d:%d '%s' is not a valid tag here, expected a '%s' tag",
+		 /* filename:line:row <xml-tag> <xml-tag> */
+		 _("%s:%d:%d <%s> is not a valid tag here, expected a <%s> tag"),
 		 data->filename,
 		 line_number, char_number, tag, expected);
   else
     g_set_error (error,
 		 GTK_BUILDER_ERROR,
 		 GTK_BUILDER_ERROR_INVALID_TAG,
-		 "%s:%d:%d '%s' is not a valid tag here",
+		 /* filename:line:row <xml-tag> <xml-tag> */
+		 _("%s:%d:%d <%s> is not a valid tag here"),
 		 data->filename,
 		 line_number, char_number, tag);
 }
@@ -174,7 +178,7 @@ _gtk_builder_boolean_from_string (const gchar  *string,
     g_set_error (error,
 		 GTK_BUILDER_ERROR,
 		 GTK_BUILDER_ERROR_INVALID_VALUE,
-		 "could not parse boolean `%s'",
+		 _("Could not parse boolean `%s'"),
 		 string);
 
   return retval;
diff --git a/gtk/gtkliststore.c b/gtk/gtkliststore.c
index 8ab1f18..cffa49e 100644
--- a/gtk/gtkliststore.c
+++ b/gtk/gtkliststore.c
@@ -2090,7 +2090,7 @@ list_store_start_element (GMarkupParseContext *context,
       if (data->row_column >= data->n_columns)
         {
 	  g_set_error (error, data->error_quark, 0,
-	  	       "Too many columns, maximum is %d\n", data->n_columns - 1);
+	  	       _("Too many columns, maximum is %d\n"), data->n_columns - 1);
           return;
         }
 
@@ -2102,14 +2102,14 @@ list_store_start_element (GMarkupParseContext *context,
 	    if (errno)
               {
 	        g_set_error (error, data->error_quark, 0,
-		  	     "the id tag %s could not be converted to an integer",
+		  	     _("The ID tag `%s' could not be converted to an integer"),
 			     values[i]);
                 return;
               }
 	    if (id < 0 || id >= data->n_columns)
               {
                 g_set_error (error, data->error_quark, 0,
-                             "id value %d out of range", id);
+                             _("ID value `%d' out of range"), id);
                 return;
               }
 	  }
@@ -2131,7 +2131,7 @@ list_store_start_element (GMarkupParseContext *context,
       if (id == -1)
         {
 	  g_set_error (error, data->error_quark, 0,
-	  	       "<col> needs an id attribute");
+	  	       _("<col> needs an ID attribute"));
           return;
         }
       
@@ -2158,7 +2158,7 @@ list_store_start_element (GMarkupParseContext *context,
     ;
   else
     g_set_error (error, data->error_quark, 0,
-		 "Unknown start tag: %s", element_name);
+		 _("Unknown start tag: %s"), element_name);
 }
 
 static void
@@ -2233,7 +2233,7 @@ list_store_end_element (GMarkupParseContext *context,
     ;
   else
     g_set_error (error, data->error_quark, 0,
-		 "Unknown end tag: %s", element_name);
+		 _("Unknown end tag: %s"), element_name);
 }
 
 static void
@@ -2280,7 +2280,7 @@ list_store_text (GMarkupParseContext *context,
       g_set_error (error,
 		   tmp_error->domain,
 		   tmp_error->code,
-		   "Could not convert '%s' to type %s: %s\n",
+		   _("Could not convert `%s' to type %s: %s\n"),
 		   text, g_type_name (data->column_types[info->id]),
 		   tmp_error->message);
       g_error_free (tmp_error);
diff --git a/gtk/gtkmain.c b/gtk/gtkmain.c
index 11aee08..31e837c 100644
--- a/gtk/gtkmain.c
+++ b/gtk/gtkmain.c
@@ -994,7 +994,7 @@ gtk_init (int *argc, char ***argv)
       const char *display_name_arg = gdk_get_display_arg_name ();
       if (display_name_arg == NULL)
         display_name_arg = getenv("DISPLAY");
-      g_warning ("cannot open display: %s", display_name_arg ? display_name_arg : "");
+      g_warning (_("Cannot open display: %s"), display_name_arg ? display_name_arg : "");
       exit (1);
     }
 }
