← Back to branch summary

~cyphermox/ubuntu/precise/xscreensaver/merge-5.15-2

« back to all changes in this revision

Viewing changes to driver/demo-Gtk-widgets.c

  • Committer: Mathieu Trudel-Lapierre
  • Date: 2011-12-21 15:57:35 UTC
  • mfrom: (1.1.13 upstream)
  • Revision ID: mathieu@canonical.com-20111221155735-m43kxy7824n1p36y
Merging shared upstream rev into target branch.

Show diffs side-by-side

added added

removed removed

Lines of Context:
driver/demo-Gtk-widgets.c
1198
1198
                            (GtkDestroyNotify) gtk_widget_unref);
1199
1199
  gtk_widget_show (grab_image_eventbox);
1200
1200
  gtk_box_pack_start (GTK_BOX (grab_vbox), grab_image_eventbox, FALSE, FALSE, 0);
1201
 
  gtk_tooltips_set_tip (tooltips, grab_image_eventbox, _("Whether the image-manipulating modes should operate on random images loaded from disk."), NULL);
 
1201
  gtk_tooltips_set_tip (tooltips, grab_image_eventbox, _("Whether the image-manipulating modes should load image files."), NULL);
1202
1202
 
1203
1203
  grab_image_button = gtk_check_button_new_with_label (_("Choose Random Image:"));
1204
1204
  gtk_widget_set_name (grab_image_button, "grab_image_button");
1233
1233
                            (GtkDestroyNotify) gtk_widget_unref);
1234
1234
  gtk_widget_show (image_text);
1235
1235
  gtk_box_pack_start (GTK_BOX (image_hbox), image_text, TRUE, TRUE, 0);
1236
 
  gtk_tooltips_set_tip (tooltips, image_text, _("The directory from which images will be randomly chosen."), NULL);
 
1236
  gtk_tooltips_set_tip (tooltips, image_text, _("The local directory, RSS feed or Atom feed from which images will be randomly chosen."), NULL);
1237
1237
 
1238
1238
  image_browse_button = gtk_button_new_with_label (_("Browse"));
1239
1239
  gtk_widget_set_name (image_browse_button, "image_browse_button");