Merge branch 'ebassi/for-master' into 'master'

Tone down a user visible message

See merge request GNOME/gtk!2678

demos/gtk-demo/main.c

@@ -391,7 +391,7 @@ display_nothing (const char *resource)
   GtkWidget *widget;
   char *str;
 
-  str = g_strdup_printf ("The lazy GTK developers forgot to add a way to display the resource '%s'", resource);
+  str = g_strdup_printf ("The contents of the resource at '%s' cannot be displayed", resource);
   widget = gtk_label_new (str);
   gtk_label_set_wrap (GTK_LABEL (widget), TRUE);