aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthew Barnes <mbarnes@redhat.com>2008-10-17 16:51:33 +0800
committerBharath Acharya <abharath@src.gnome.org>2008-10-17 16:51:33 +0800
commitbbbcb08af033697dfee8b82f61f96bc0ffd77093 (patch)
tree05f1916de8ad4caac894a553fd1a33e2cb0adb9a
parent7d9f28248b4472b9a9d1953b5be9e0179de0ec45 (diff)
downloadgsoc2013-evolution-bbbcb08af033697dfee8b82f61f96bc0ffd77093.tar.gz
gsoc2013-evolution-bbbcb08af033697dfee8b82f61f96bc0ffd77093.tar.zst
gsoc2013-evolution-bbbcb08af033697dfee8b82f61f96bc0ffd77093.zip
** Fix for bug #503898
2008-10-17 Matthew Barnes <mbarnes@redhat.com> ** Fix for bug #503898 * filter-rule.c: (get_widget): s/criteria/condition/ svn path=/trunk/; revision=36637
-rw-r--r--filter/ChangeLog6
-rw-r--r--filter/filter-rule.c6
2 files changed, 9 insertions, 3 deletions
diff --git a/filter/ChangeLog b/filter/ChangeLog
index b66dbb7ff6..3534320543 100644
--- a/filter/ChangeLog
+++ b/filter/ChangeLog
@@ -1,3 +1,9 @@
+2008-10-17 Matthew Barnes <mbarnes@redhat.com>
+
+ ** Fix for bug #503898
+
+ * filter-rule.c: (get_widget): s/criteria/condition/
+
2008-10-06 Lucian Langa <lucilanga@gnome.org>
** Fix for bug #554566
diff --git a/filter/filter-rule.c b/filter/filter-rule.c
index c0123e21c3..794c94498d 100644
--- a/filter/filter-rule.c
+++ b/filter/filter-rule.c
@@ -878,7 +878,7 @@ get_widget (FilterRule *fr, struct _RuleContext *f)
gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, 0);
gtk_widget_show (hbox);
- text = g_strdup_printf("<b>%s</b>", _("Find items that meet the following criteria"));
+ text = g_strdup_printf("<b>%s</b>", _("Find items that meet the following conditions"));
label = gtk_label_new (text);
gtk_label_set_use_markup (GTK_LABEL (label), TRUE);
gtk_misc_set_alignment (GTK_MISC (label), 0, 0.5);
@@ -912,13 +912,13 @@ get_widget (FilterRule *fr, struct _RuleContext *f)
hbox = gtk_hbox_new (FALSE, 3);
- add = gtk_button_new_with_mnemonic (_("A_dd Filter Criteria"));
+ add = gtk_button_new_with_mnemonic (_("A_dd Condition"));
gtk_button_set_image (GTK_BUTTON (add), gtk_image_new_from_stock (GTK_STOCK_ADD, GTK_ICON_SIZE_BUTTON));
g_signal_connect (add, "clicked", G_CALLBACK (more_parts), data);
gtk_box_pack_start (GTK_BOX (hbox), add, FALSE, FALSE, 0);
if (f->flags & RULE_CONTEXT_GROUPING) {
- const char *thread_types[] = { N_("If all criteria are met"), N_("If any criteria are met") };
+ const char *thread_types[] = { N_("If all conditions are met"), N_("If any conditions are met") };
label = gtk_label_new_with_mnemonic (_("_Find items:"));
menu = gtk_menu_new ();