[vinagre] Correct some UI strings and stock icon usage

[David King <davidk src gnome org>]

commit e26c872f15d02b6fc3106932e515785fe7a30f8e
Author: David King <amigadave amigadave com>
Date:   Sat Apr 16 20:09:15 2011 +0200

    Correct some UI strings and stock icon usage
    
    Replace â??closeâ?? with â??disconnectâ?? when it refers to a connection. Rename
    functions appropriately. Change some stock icons to be more suitable.

 data/vinagre-ui.xml        |    6 +++---
 vinagre/vinagre-commands.c |    4 ++--
 vinagre/vinagre-commands.h |    6 +++---
 vinagre/vinagre-tab.c      |    2 +-
 vinagre/vinagre-ui.h       |   19 ++++++++++---------
 5 files changed, 19 insertions(+), 18 deletions(-)
---
diff --git a/data/vinagre-ui.xml b/data/vinagre-ui.xml
index dc376aa..ed137dd 100644
--- a/data/vinagre-ui.xml
+++ b/data/vinagre-ui.xml
@@ -25,14 +25,14 @@
       <menuitem name="RemoteConnectMenu" action="RemoteConnect"/>
       <menuitem name="RemoteOpenMenu" action="RemoteOpen"/>
       <separator/>
-      <menuitem name="RemoteCloseMenu" action="RemoteClose"/>
+      <menuitem name="RemoteDisconnectMenu" action="RemoteDisconnect"/>
       <menuitem name="RemoteTakeScreenshotMenu" action="RemoteTakeScreenshot"/>
       <placeholder name="RemoteOps_1" />
       <placeholder name="FileRecentsPlaceholder">
         <separator/>
       </placeholder>
       <separator/>
-      <menuitem name="RemoteCloseAllMenu" action="RemoteCloseAll"/>
+      <menuitem name="RemoteDisconnectAllMenu" action="RemoteDisconnectAll"/>
       <menuitem name="RemoteQuitMenu" action="RemoteQuit"/>
     </menu>
 
@@ -65,7 +65,7 @@
 
   <toolbar name="ToolBar">
     <toolitem action="RemoteConnect"/>
-    <toolitem action="RemoteClose"/>
+    <toolitem action="RemoteDisconnect"/>
     <separator/>
     <toolitem action="ViewFullScreen"/>
     <toolitem action="RemoteTakeScreenshot"/>
diff --git a/vinagre/vinagre-commands.c b/vinagre/vinagre-commands.c
index 7b0ba14..fc676c2 100644
--- a/vinagre/vinagre-commands.c
+++ b/vinagre/vinagre-commands.c
@@ -192,7 +192,7 @@ finalize:
 }
 
 void
-vinagre_cmd_remote_close (GtkAction     *action,
+vinagre_cmd_remote_disconnect (GtkAction     *action,
 			   VinagreWindow *window)
 {
   vinagre_window_close_active_tab (window);
@@ -206,7 +206,7 @@ vinagre_cmd_remote_take_screenshot (GtkAction     *action,
 }
 
 void
-vinagre_cmd_remote_close_all (GtkAction     *action,
+vinagre_cmd_remote_disconnect_all (GtkAction     *action,
 			       VinagreWindow *window)
 {
   vinagre_window_close_all_tabs (window);
diff --git a/vinagre/vinagre-commands.h b/vinagre/vinagre-commands.h
index 2cbcbd0..0cdb230 100644
--- a/vinagre/vinagre-commands.h
+++ b/vinagre/vinagre-commands.h
@@ -34,13 +34,13 @@ void		vinagre_cmd_remote_connect	(GtkAction     *action,
 						 VinagreWindow *window);
 void		vinagre_cmd_remote_open	(GtkAction     *action,
 					 VinagreWindow *window);
-void		vinagre_cmd_remote_close	(GtkAction     *action,
+void		vinagre_cmd_remote_disconnect	(GtkAction     *action,
 						 VinagreWindow *window);
 void		vinagre_cmd_remote_take_screenshot (GtkAction     *action,
 						    VinagreWindow *window);
 
-void		vinagre_cmd_remote_close_all	(GtkAction     *action,
-						 VinagreWindow *window);
+void		vinagre_cmd_remote_disconnect_all	(GtkAction     *action,
+							 VinagreWindow *window);
 void		vinagre_cmd_remote_quit	(GtkAction     *action,
 					 VinagreWindow *window);
 
diff --git a/vinagre/vinagre-tab.c b/vinagre/vinagre-tab.c
index 323b639..57e06de 100644
--- a/vinagre/vinagre-tab.c
+++ b/vinagre/vinagre-tab.c
@@ -351,7 +351,7 @@ setup_layout (VinagreTab *tab)
 
   /* Close connection */
   button = GTK_WIDGET (gtk_tool_button_new_from_stock (GTK_STOCK_CLOSE));
-  gtk_tool_item_set_tooltip_text (GTK_TOOL_ITEM (button), _("Close connection"));
+  gtk_tool_item_set_tooltip_text (GTK_TOOL_ITEM (button), _("Disconnect"));
   gtk_widget_show (GTK_WIDGET (button));
   gtk_toolbar_insert (GTK_TOOLBAR (tab->priv->toolbar), GTK_TOOL_ITEM (button), 0);
   g_signal_connect (button, "clicked", G_CALLBACK (close_button_clicked), tab);
diff --git a/vinagre/vinagre-ui.h b/vinagre/vinagre-ui.h
index 8e96642..7c3e38d 100644
--- a/vinagre/vinagre-ui.h
+++ b/vinagre/vinagre-ui.h
@@ -47,12 +47,13 @@ static const GtkActionEntry vinagre_always_sensitive_entries[] =
   /* Edit menu */
   { "EditPreferences", GTK_STOCK_PREFERENCES, NULL, NULL,
     N_("Edit the application preferences"), G_CALLBACK (vinagre_cmd_edit_preferences) },
+  /* TODO: Use a more appropriate icon. Libpeas uses "libpeas-plugin".  */
   { "EditPlugins", GTK_STOCK_EXECUTE, N_("_Plugins"), NULL,
     N_("Select plugins"), G_CALLBACK (vinagre_cmd_edit_plugins) },
 
   /* Help menu */
   {"HelpContents", GTK_STOCK_HELP, N_("_Contents"), "F1",
-    N_("Open the vinagre manual"),  G_CALLBACK (vinagre_cmd_help_contents)},
+    N_("Open the Vinagre manual"),  G_CALLBACK (vinagre_cmd_help_contents)},
   { "HelpAbout", GTK_STOCK_ABOUT, NULL, NULL,
     N_("About this application"), G_CALLBACK (vinagre_cmd_help_about) }
 };
@@ -75,14 +76,14 @@ static const GtkToggleActionEntry vinagre_always_sensitive_toggle_entries[] =
 static const GtkActionEntry vinagre_remote_connected_entries[] =
 {
   /* Remote menu */
-  { "RemoteClose", GTK_STOCK_CLOSE, NULL, "<control>W",
-    N_("Close the current connection"), G_CALLBACK (vinagre_cmd_remote_close) },
-  { "RemoteCloseAll", GTK_STOCK_CLOSE, N_("C_lose All"), "<control><shift>W",
-    N_("Close all active connections"), G_CALLBACK (vinagre_cmd_remote_close_all) },
+  { "RemoteDisconnect", GTK_STOCK_DISCONNECT, NULL, "<control>W",
+    N_("Disconnect the current connection"), G_CALLBACK (vinagre_cmd_remote_disconnect) },
+  { "RemoteDisconnectAll", GTK_STOCK_DISCONNECT, N_("Disconnect All"), "<control><shift>W",
+    N_("Disconnect all connections"), G_CALLBACK (vinagre_cmd_remote_disconnect_all) },
 
   /* Bookmarks menu */
-  { "BookmarksAdd", GTK_STOCK_SAVE, N_("_Add to bookmarks"), "<control>D",
-    N_("Add current connection to your bookmarks"), G_CALLBACK (vinagre_cmd_bookmarks_add) }
+  { "BookmarksAdd", GTK_STOCK_ADD, N_("_Add to bookmarks"), "<control>D",
+    N_("Add the current connection to your bookmarks"), G_CALLBACK (vinagre_cmd_bookmarks_add) }
 
 };
 
@@ -90,11 +91,11 @@ static const GtkActionEntry vinagre_remote_initialized_entries[] =
 {
   /* Remote menu */
   { "RemoteTakeScreenshot", "applets-screenshooter", N_("_Take screenshot"), NULL,
-    N_("Take a screenshot of active connection"), G_CALLBACK (vinagre_cmd_remote_take_screenshot) },
+    N_("Take a screenshot of the active connection"), G_CALLBACK (vinagre_cmd_remote_take_screenshot) },
 
   /* View menu */
   { "ViewFullScreen", GTK_STOCK_FULLSCREEN, NULL, "F11",
-    N_("View the current remote desktop in full screen"), G_CALLBACK (vinagre_cmd_view_fullscreen) }
+    N_("View the current remote desktop in fullscreen mode"), G_CALLBACK (vinagre_cmd_view_fullscreen) }
 };
 
 static const GtkToggleActionEntry vinagre_remote_initialized_toggle_entries[] =