[Xfce4-commits] <xfce4-settings:jeromeg/settings-editor> Make the UI consistent with xfconf-query.

[Jérôme Guelfucci]

Updating branch refs/heads/jeromeg/settings-editor
         to 94fc1d757e87f960a9cff6533d68909e05bb5275 (commit)
       from 165525f8b63545ae313a822cb805843342fcbf98 (commit)

commit 94fc1d757e87f960a9cff6533d68909e05bb5275
Author: Jérôme Guelfucci <jeromeg at xfce.org>
Date:   Thu Jan 14 19:59:27 2010 +0100

    Make the UI consistent with xfconf-query.
    
    Use "Reset" instead of "Reset/remove" and "Remove/reset".

 xfce4-settings-editor/main_window.c               |    6 +++---
 xfce4-settings-editor/xfce4-settings-editor.glade |    2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/xfce4-settings-editor/main_window.c b/xfce4-settings-editor/main_window.c
index 882e7a0..914c2bc 100644
--- a/xfce4-settings-editor/main_window.c
+++ b/xfce4-settings-editor/main_window.c
@@ -930,8 +930,8 @@ cb_property_revert_button_clicked (GtkButton *button, GtkBuilder *builder)
     response = xfce_dialog_confirm (GTK_WINDOW (gtk_builder_get_object (builder, "main_window")),
                                     GTK_STOCK_YES,
                                     _("Reset"),
-                                    _("Resetting a channel will permanently remove those custom settings."),
-                                    _("Are you sure you want to reset channel \"%s\" and all its properties?"),
+                                    _("Resetting a property will permanently remove those custom settings."),
+                                    _("Are you sure you want to reset property \"%s\"?"),
                                     current_property);
 
     if (response)
@@ -1043,7 +1043,7 @@ channel_treeview_popup_menu (GtkWidget *widget, GdkEventButton *event, GtkBuilde
     menu = gtk_menu_new ();
     g_signal_connect (menu, "deactivate", G_CALLBACK (gtk_menu_popdown), NULL);
 
-    menu_item = gtk_image_menu_item_new_with_mnemonic (_("_Remove/reset"));
+    menu_item = gtk_image_menu_item_new_with_mnemonic (_("_Reset"));
     image = gtk_image_new_from_stock ("gtk-remove", GTK_ICON_SIZE_MENU);
     gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_item), image);
     gtk_menu_shell_append (GTK_MENU_SHELL (menu), menu_item);
diff --git a/xfce4-settings-editor/xfce4-settings-editor.glade b/xfce4-settings-editor/xfce4-settings-editor.glade
index 5853146..0cdd942 100644
--- a/xfce4-settings-editor/xfce4-settings-editor.glade
+++ b/xfce4-settings-editor/xfce4-settings-editor.glade
@@ -317,7 +317,7 @@
                         <child>
                           <object class="GtkToolButton" id="property_revert_button">
                             <property name="visible">True</property>
-                            <property name="tooltip_text" translatable="yes">Reset/remove property</property>
+                            <property name="tooltip_text" translatable="yes">Reset property</property>
                             <property name="stock_id">gtk-revert-to-saved</property>
                           </object>
                           <packing>