GNOME.org
 

[vinagre] Use ‘remote desktop’ rather than ‘machine’

commit bb2cab2a3bef70abf824ef60a6f78bab33f55cdc
Author: David King <amigadave amigadave com>
Date:   Sat Apr 16 16:27:40 2011 +0200

    Use â??remote desktopâ?? rather than â??machineâ??
    
    As mentioned in bug 574138, Vinagre often used â??machineâ?? and â??remote
    desktopâ?? interchangeably. This commit consistently uses â??remoteâ??,
    â??remote desktopâ?? and â??remote hostâ?? where appropriate.

 data/org.gnome.panel.Vinagre.panel-applet.in.in  |    2 +-
 data/vinagre-ui.xml                              |   22 ++++++------
 data/vinagre.ui                                  |    2 +-
 plugins/rdp/vinagre-rdp-plugin.c                 |    6 ++--
 plugins/reverse-vnc/reverse-vnc.ui               |    6 ++--
 plugins/reverse-vnc/vinagre-reverse-vnc-plugin.c |    2 +-
 plugins/spice/vinagre-spice-tab.c                |    8 ++--
 plugins/ssh/vinagre-ssh-plugin.c                 |    2 +-
 plugins/vnc/vinagre-vnc-plugin.c                 |    2 +-
 plugins/vnc/vinagre-vnc-tab.c                    |   12 +++---
 vinagre.doap                                     |    2 +-
 vinagre/vinagre-commands.c                       |   14 ++++----
 vinagre/vinagre-commands.h                       |   18 +++++-----
 vinagre/vinagre-fav.c                            |    4 +-
 vinagre/vinagre-mdns.c                           |    2 +-
 vinagre/vinagre-notebook.c                       |    2 +-
 vinagre/vinagre-ssh.c                            |    6 ++--
 vinagre/vinagre-ui.h                             |   40 +++++++++++-----------
 vinagre/vinagre-window-private.h                 |    4 +-
 vinagre/vinagre-window.c                         |   30 ++++++++--------
 20 files changed, 93 insertions(+), 93 deletions(-)
---
diff --git a/data/org.gnome.panel.Vinagre.panel-applet.in.in b/data/org.gnome.panel.Vinagre.panel-applet.in.in
index 4b8ee85..efa201b 100644
--- a/data/org.gnome.panel.Vinagre.panel-applet.in.in
+++ b/data/org.gnome.panel.Vinagre.panel-applet.in.in
@@ -6,7 +6,7 @@ _Description=Vinagre Applet Factory
 
 [VinagreApplet]
 _Name=Remote Desktop Viewer
-_Description=A menu to quickly access remote machines
+_Description=A menu to quickly access remote desktops
 Icon=preferences-desktop-remote-desktop
 BonoboId=OAFIID:GNOME_VinagreApplet
 X-GNOME-Bugzilla-Bugzilla=GNOME
diff --git a/data/vinagre-ui.xml b/data/vinagre-ui.xml
index 81d6095..dc376aa 100644
--- a/data/vinagre-ui.xml
+++ b/data/vinagre-ui.xml
@@ -21,19 +21,19 @@
 <ui>
 
   <menubar name="MenuBar">
-    <menu name="MachineMenu" action="Machine">
-      <menuitem name="MachineConnectMenu" action="MachineConnect"/>
-      <menuitem name="MachineOpenMenu" action="MachineOpen"/>
+    <menu name="RemoteMenu" action="Remote">
+      <menuitem name="RemoteConnectMenu" action="RemoteConnect"/>
+      <menuitem name="RemoteOpenMenu" action="RemoteOpen"/>
       <separator/>
-      <menuitem name="MachineCloseMenu" action="MachineClose"/>
-      <menuitem name="MachineTakeScreenshotMenu" action="MachineTakeScreenshot"/>
-      <placeholder name="MachineOps_1" />
+      <menuitem name="RemoteCloseMenu" action="RemoteClose"/>
+      <menuitem name="RemoteTakeScreenshotMenu" action="RemoteTakeScreenshot"/>
+      <placeholder name="RemoteOps_1" />
       <placeholder name="FileRecentsPlaceholder">
         <separator/>
       </placeholder>
       <separator/>
-      <menuitem name="MachineCloseAllMenu" action="MachineCloseAll"/>
-      <menuitem name="MachineQuitMenu" action="MachineQuit"/>
+      <menuitem name="RemoteCloseAllMenu" action="RemoteCloseAll"/>
+      <menuitem name="RemoteQuitMenu" action="RemoteQuit"/>
     </menu>
 
     <menu name="EditMenu" action="Edit">
@@ -64,11 +64,11 @@
   </menubar>
 
   <toolbar name="ToolBar">
-    <toolitem action="MachineConnect"/>
-    <toolitem action="MachineClose"/>
+    <toolitem action="RemoteConnect"/>
+    <toolitem action="RemoteClose"/>
     <separator/>
     <toolitem action="ViewFullScreen"/>
-    <toolitem action="MachineTakeScreenshot"/>
+    <toolitem action="RemoteTakeScreenshot"/>
     <separator/>
   </toolbar>
 
diff --git a/data/vinagre.ui b/data/vinagre.ui
index 4e8dc7a..56b79ba 100644
--- a/data/vinagre.ui
+++ b/data/vinagre.ui
@@ -21,7 +21,7 @@
             <property name="visible">True</property>
             <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
             <property name="xalign">0</property>
-            <property name="label" translatable="yes">Which machine do you want to connect to?</property>
+            <property name="label" translatable="yes">Choose a remote desktop to connect to</property>
             <attributes>
               <attribute name="weight" value="bold"/>
             </attributes>
diff --git a/plugins/rdp/vinagre-rdp-plugin.c b/plugins/rdp/vinagre-rdp-plugin.c
index 11396c1..50ac6d5 100644
--- a/plugins/rdp/vinagre-rdp-plugin.c
+++ b/plugins/rdp/vinagre-rdp-plugin.c
@@ -53,8 +53,8 @@ impl_get_public_description (VinagreProtocol *plugin)
   gchar **result = g_new (gchar *, 3);
 
   result[0] = g_strdup (_("RDP"));
-  /* Translators: This is a description of the RDP protocol. It appears at Connect dialog. */
-  result[1] = g_strdup (_("Access MS Windows machines"));
+  /* Translators: This is a description of the RDP protocol. It appears in the Connect dialog. */
+  result[1] = g_strdup (_("Access MS Windows remote desktops"));
   result[2] = NULL;
 
   return result;
@@ -110,7 +110,7 @@ impl_get_connect_widget (VinagreProtocol *plugin, VinagreConnection *conn)
 
   u_entry = gtk_entry_new ();
   /* Translators: This is the tooltip for the username field in a RDP connection */
-  gtk_widget_set_tooltip_text (u_entry, _("Optional. If blank, your username will be used. Also, it can be supplied in the Machine field above, in the form username hostname "));
+  gtk_widget_set_tooltip_text (u_entry, _("Optional. If blank, your username will be used. Also, it can be supplied in the Host field above, in the form username hostname "));
   g_object_set_data (G_OBJECT (box), "username_entry", u_entry);
   gtk_box_pack_start (GTK_BOX (u_box), u_entry, TRUE, TRUE, 5);
   gtk_label_set_mnemonic_widget (GTK_LABEL (label), u_entry);
diff --git a/plugins/reverse-vnc/reverse-vnc.ui b/plugins/reverse-vnc/reverse-vnc.ui
index ec8d995..c7393c3 100644
--- a/plugins/reverse-vnc/reverse-vnc.ui
+++ b/plugins/reverse-vnc/reverse-vnc.ui
@@ -41,7 +41,7 @@
                   <object class="GtkLabel" id="label1">
                     <property name="visible">True</property>
                     <property name="xalign">0</property>
-                    <property name="label" translatable="yes">By activating reverse connections you can access machines that are behind a firewall. The remote side is supposed to initiate the connection with you. For further information, checkout the help.</property>
+                    <property name="label" translatable="yes">By activating reverse connections you can access remote desktops that are behind a firewall. The remote side is supposed to initiate the connection with you. For further information, read the help.</property>
                     <property name="wrap">True</property>
                     <attributes>
                       <attribute name="style" value="italic"/>
@@ -90,7 +90,7 @@
                     </child>
                     <child>
                       <object class="GtkCheckButton" id="always_enabled_check">
-                        <property name="label" translatable="yes" comments="Translators: this is the reverse connection mode. &quot;Always enabled&quot; means it will be enabled by default in the program startup. You can see this string in the dialog Machine-&gt;Reverse connections.">_Always Enabled</property>
+                        <property name="label" translatable="yes" comments="Translators: this is the reverse connection mode. &quot;Always enabled&quot; means it will be enabled by default in the program startup. You can see this string in the dialog Remote-&gt;Reverse connections.">_Always Enabled</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
@@ -152,7 +152,7 @@
                                   <object class="GtkLabel" id="label6">
                                     <property name="visible">True</property>
                                     <property name="xalign">0</property>
-                                    <property name="label" translatable="yes">This machine is reachable through the following IP address(es):</property>
+                                    <property name="label" translatable="yes">This desktop is reachable through the following IP address(es):</property>
                                     <attributes>
                                       <attribute name="style" value="italic"/>
                                     </attributes>
diff --git a/plugins/reverse-vnc/vinagre-reverse-vnc-plugin.c b/plugins/reverse-vnc/vinagre-reverse-vnc-plugin.c
index 6d644a3..57d72a8 100644
--- a/plugins/reverse-vnc/vinagre-reverse-vnc-plugin.c
+++ b/plugins/reverse-vnc/vinagre-reverse-vnc-plugin.c
@@ -100,7 +100,7 @@ impl_activate (PeasActivatable *activatable)
   priv->ui_id = gtk_ui_manager_new_merge_id (manager);
   gtk_ui_manager_add_ui (manager,
 			 priv->ui_id,
-			 "/MenuBar/MachineMenu/MachineOps_1",
+			 "/MenuBar/RemoteMenu/RemoteOps_1",
 			 "VNCListener",
 			 "VNCListener",
 			 GTK_UI_MANAGER_AUTO,
diff --git a/plugins/spice/vinagre-spice-tab.c b/plugins/spice/vinagre-spice-tab.c
index f605034..435c054 100644
--- a/plugins/spice/vinagre-spice-tab.c
+++ b/plugins/spice/vinagre-spice-tab.c
@@ -521,15 +521,15 @@ create_initialized_actions (VinagreSpiceTab *tab)
   GSList *list = NULL;
   VinagreTabUiAction *a;
 
-  /* Machine->Send CTRL-ALT-DEL */
+  /* Remote->Send CTRL-ALT-DEL */
   a = g_new (VinagreTabUiAction, 1);
   a->paths = g_new (gchar *, 3);
-  a->paths[0] = g_strdup ("/MenuBar/MachineMenu/MachineOps_1");
+  a->paths[0] = g_strdup ("/MenuBar/RemoteeMenu/RemoteOps_1");
   a->paths[1] = g_strdup ("/ToolBar");
   a->paths[2] = NULL;
-  a->action = gtk_action_new ("SPICEMachineSendCtrlAltDel",
+  a->action = gtk_action_new ("SPICERemoteSendCtrlAltDel",
 			      _("_Send Ctrl-Alt-Del"),
-			      _("Sends Ctrl+Alt+Del to the remote machine"),
+			      _("Sends Ctrl+Alt+Del to the remote desktop"),
 			      "preferences-desktop-keyboard-shortcuts");
   gtk_action_set_is_important (a->action, TRUE);
   gtk_action_set_icon_name (a->action, "preferences-desktop-keyboard-shortcuts");
diff --git a/plugins/ssh/vinagre-ssh-plugin.c b/plugins/ssh/vinagre-ssh-plugin.c
index 20d8931..4b1063f 100644
--- a/plugins/ssh/vinagre-ssh-plugin.c
+++ b/plugins/ssh/vinagre-ssh-plugin.c
@@ -115,7 +115,7 @@ impl_get_connect_widget (VinagreProtocol *plugin, VinagreConnection *conn)
 
   u_entry = gtk_entry_new ();
   /* Translators: This is the tooltip for the username field in a SSH connection */
-  gtk_widget_set_tooltip_text (u_entry, _("Optional. If blank, your username will be used. Also, it can be supplied in the Machine field above, in the form username hostname "));
+  gtk_widget_set_tooltip_text (u_entry, _("Optional. If blank, your username will be used. Also, it can be supplied in the Host field above, in the form username hostname "));
   g_object_set_data (G_OBJECT (box), "username_entry", u_entry);
   gtk_box_pack_start (GTK_BOX (u_box), u_entry, TRUE, TRUE, 5);
   gtk_label_set_mnemonic_widget (GTK_LABEL (label), u_entry);
diff --git a/plugins/vnc/vinagre-vnc-plugin.c b/plugins/vnc/vinagre-vnc-plugin.c
index e0c2fc5..e76b43a 100644
--- a/plugins/vnc/vinagre-vnc-plugin.c
+++ b/plugins/vnc/vinagre-vnc-plugin.c
@@ -85,7 +85,7 @@ impl_get_public_description (VinagreProtocol *plugin)
   gchar **result = g_new (gchar *, 3);
 
   result[0] = g_strdup (_("VNC"));
-  result[1] = g_strdup (_("Access Unix/Linux, Windows and other machines."));
+  result[1] = g_strdup (_("Access Unix/Linux, Windows and other remote desktops."));
   result[2] = NULL;
 
   return result;
diff --git a/plugins/vnc/vinagre-vnc-tab.c b/plugins/vnc/vinagre-vnc-tab.c
index 7a43701..d3af930 100644
--- a/plugins/vnc/vinagre-vnc-tab.c
+++ b/plugins/vnc/vinagre-vnc-tab.c
@@ -522,7 +522,7 @@ vnc_authentication_cb (VncDisplay *vnc, GValueArray *credList, VinagreVncTab *vn
 	    {
 	      vinagre_tab_remove_from_notebook (tab);
 	      vinagre_utils_show_error (_("Authentication error"),
-					_("A username is required in order to access this machine."),
+					_("A username is required in order to access this remote desktop."),
 					window);
 	      goto out;
 	    }
@@ -539,7 +539,7 @@ vnc_authentication_cb (VncDisplay *vnc, GValueArray *credList, VinagreVncTab *vn
 	    {
 	      vinagre_tab_remove_from_notebook (tab);
 	      vinagre_utils_show_error (_("Authentication error"),
-					_("A password is required in order to access this machine."),
+					_("A password is required in order to access this remote desktop."),
 					window);
 	      goto out;
 	    }
@@ -666,15 +666,15 @@ create_initialized_actions (VinagreVncTab *tab)
   GSList *list = NULL;
   VinagreTabUiAction *a;
 
-  /* Machine->Send CTRL-ALT-DEL */
+  /* Remote->Send CTRL-ALT-DEL */
   a = g_new (VinagreTabUiAction, 1);
   a->paths = g_new (gchar *, 3);
-  a->paths[0] = g_strdup ("/MenuBar/MachineMenu/MachineOps_1");
+  a->paths[0] = g_strdup ("/MenuBar/RemoteMenu/RemoteOps_1");
   a->paths[1] = g_strdup ("/ToolBar");
   a->paths[2] = NULL;
-  a->action = gtk_action_new ("VNCMachineSendCtrlAltDel",
+  a->action = gtk_action_new ("VNCRemoteSendCtrlAltDel",
 			      _("_Send Ctrl-Alt-Del"),
-			      _("Sends Ctrl+Alt+Del to the remote machine"),
+			      _("Sends Ctrl+Alt+Del to the remote desktop"),
 			      "preferences-desktop-keyboard-shortcuts");
   gtk_action_set_is_important (a->action, TRUE);
   gtk_action_set_icon_name (a->action, "preferences-desktop-keyboard-shortcuts");
diff --git a/vinagre.doap b/vinagre.doap
index f34ff42..7468c3f 100644
--- a/vinagre.doap
+++ b/vinagre.doap
@@ -7,7 +7,7 @@
   <name xml:lang="en">Vinagre</name>
   <shortdesc xml:lang="en">Remote Desktop Viewer</shortdesc>
   <description>Vinagre is a remote desktop viewer for GNOME, that uses
-  Virtual Network Computing (VNC) to remotely control another computer.
+  Virtual Network Computing (VNC) to remotely control another desktop.
   </description>
   <homepage rdf:resource="http://projects.gnome.org/vinagre/"; />
   <download-page rdf:resource="http://download.gnome.org/sources/vinagre/"; />
diff --git a/vinagre/vinagre-commands.c b/vinagre/vinagre-commands.c
index cf8b055..7b0ba14 100644
--- a/vinagre/vinagre-commands.c
+++ b/vinagre/vinagre-commands.c
@@ -64,9 +64,9 @@ vinagre_cmd_direct_connect (VinagreConnection *conn,
     }
 }
 
-/* Machine Menu */
+/* Remote Menu */
 void
-vinagre_cmd_machine_connect (GtkAction     *action,
+vinagre_cmd_remote_connect (GtkAction     *action,
 			     VinagreWindow *window)
 {
   VinagreTab *tab;
@@ -101,7 +101,7 @@ vinagre_cmd_free_string_list (gpointer str, gpointer user_data)
 }
 
 void
-vinagre_cmd_machine_open (GtkAction     *action,
+vinagre_cmd_remote_open (GtkAction     *action,
 			  VinagreWindow *window)
 {
   GtkWidget         *tab;
@@ -192,28 +192,28 @@ finalize:
 }
 
 void
-vinagre_cmd_machine_close (GtkAction     *action,
+vinagre_cmd_remote_close (GtkAction     *action,
 			   VinagreWindow *window)
 {
   vinagre_window_close_active_tab (window);
 }
 
 void
-vinagre_cmd_machine_take_screenshot (GtkAction     *action,
+vinagre_cmd_remote_take_screenshot (GtkAction     *action,
 				     VinagreWindow *window)
 {
   vinagre_tab_take_screenshot (vinagre_window_get_active_tab (window));
 }
 
 void
-vinagre_cmd_machine_close_all (GtkAction     *action,
+vinagre_cmd_remote_close_all (GtkAction     *action,
 			       VinagreWindow *window)
 {
   vinagre_window_close_all_tabs (window);
 }
 
 void
-vinagre_cmd_machine_quit (GtkAction     *action,
+vinagre_cmd_remote_quit (GtkAction     *action,
 			  VinagreWindow *window)
 {
   gtk_widget_destroy (GTK_WIDGET (window));
diff --git a/vinagre/vinagre-commands.h b/vinagre/vinagre-commands.h
index adc3b75..2cbcbd0 100644
--- a/vinagre/vinagre-commands.h
+++ b/vinagre/vinagre-commands.h
@@ -30,19 +30,19 @@ G_BEGIN_DECLS
 void		vinagre_cmd_direct_connect	(VinagreConnection *conn,
 						 VinagreWindow     *window);
 
-void		vinagre_cmd_machine_connect	(GtkAction     *action,
+void		vinagre_cmd_remote_connect	(GtkAction     *action,
 						 VinagreWindow *window);
-void		vinagre_cmd_machine_open	(GtkAction     *action,
+void		vinagre_cmd_remote_open	(GtkAction     *action,
+					 VinagreWindow *window);
+void		vinagre_cmd_remote_close	(GtkAction     *action,
 						 VinagreWindow *window);
-void		vinagre_cmd_machine_close	(GtkAction     *action,
-						 VinagreWindow *window);
-void		vinagre_cmd_machine_take_screenshot (GtkAction     *action,
-						     VinagreWindow *window);
+void		vinagre_cmd_remote_take_screenshot (GtkAction     *action,
+						    VinagreWindow *window);
 
-void		vinagre_cmd_machine_close_all	(GtkAction     *action,
-						 VinagreWindow *window);
-void		vinagre_cmd_machine_quit	(GtkAction     *action,
+void		vinagre_cmd_remote_close_all	(GtkAction     *action,
 						 VinagreWindow *window);
+void		vinagre_cmd_remote_quit	(GtkAction     *action,
+					 VinagreWindow *window);
 
 void		vinagre_cmd_edit_preferences	(GtkAction     *action,
 						 VinagreWindow *window);
diff --git a/vinagre/vinagre-fav.c b/vinagre/vinagre-fav.c
index 0d4633e..80b88ec 100644
--- a/vinagre/vinagre-fav.c
+++ b/vinagre/vinagre-fav.c
@@ -566,14 +566,14 @@ vinagre_fav_bookmarks_open (GtkAction  *action,
 
 static const GtkActionEntry always_sensitive_actions[] =
 {
-  {"BookmarksNewFolder", "folder-new", N_("_New Folder"), NULL,
+  {"BookmarksNewFolder", "folder-new", N_("_New folder"), NULL,
     N_("Create a new folder"), G_CALLBACK (vinagre_fav_bookmarks_new_folder) },
 };
 
 static const GtkActionEntry actions[] =
 {
   { "BookmarksOpen", GTK_STOCK_CONNECT, N_("_Open bookmark"), NULL,
-    N_("Connect to this machine"), G_CALLBACK (vinagre_fav_bookmarks_open) },
+    N_("Connect to this remote desktop"), G_CALLBACK (vinagre_fav_bookmarks_open) },
   {"BookmarksEdit", GTK_STOCK_EDIT, N_("_Edit bookmark"), NULL,
     N_("Edit the details of selected bookmark"), G_CALLBACK (vinagre_fav_bookmarks_edit) },
   {"BookmarksDel", GTK_STOCK_DELETE, N_("_Remove from bookmarks"), NULL,
diff --git a/vinagre/vinagre-mdns.c b/vinagre/vinagre-mdns.c
index 0b08d90..d651d62 100644
--- a/vinagre/vinagre-mdns.c
+++ b/vinagre/vinagre-mdns.c
@@ -247,7 +247,7 @@ vinagre_mdns_add_service (VinagreMdns     *mdns,
                                   mdns->priv->client,
                                   &error))
     {
-        /* Translators: "Browse for hosts" means the ability to find/locate some machines [with the VNC service enabled] in the local network */
+        /* Translators: "Browse for hosts" means the ability to find/locate some remote hosts [with the VNC service enabled] in the local network */
         g_warning (_("Failed to browse for hosts: %s\n"), error->message);
         g_error_free (error);
         return;
diff --git a/vinagre/vinagre-notebook.c b/vinagre/vinagre-notebook.c
index 348ef01..d349e6f 100644
--- a/vinagre/vinagre-notebook.c
+++ b/vinagre/vinagre-notebook.c
@@ -211,7 +211,7 @@ vinagre_notebook_update_ui_sentitivity (VinagreNotebook *nb)
 	   (vinagre_tab_get_state (VINAGRE_TAB (nb->priv->active_tab)) == VINAGRE_TAB_STATE_CONNECTED);
   gtk_action_group_set_sensitive (action_group, active);
 
-  action = gtk_action_group_get_action (action_group, "MachineTakeScreenshot");
+  action = gtk_action_group_get_action (action_group, "RemoteTakeScreenshot");
   gtk_action_set_sensitive (action, active &&
 				    nb->priv->active_tab &&
 				    vinagre_tab_get_has_screenshot (nb->priv->active_tab));
diff --git a/vinagre/vinagre-ssh.c b/vinagre/vinagre-ssh.c
index f79f794..b7f8947 100644
--- a/vinagre/vinagre-ssh.c
+++ b/vinagre/vinagre-ssh.c
@@ -485,9 +485,9 @@ handle_login (GtkWindow *parent,
 
 	  get_hostname_and_fingerprint_from_line (buffer, &hostname, &fingerprint);
 
-	  message = g_strdup_printf (_("The identity of the remote computer (%s) is unknown.\n"
-				       "This happens when you log in to a computer the first time.\n\n"
-				       "The identity sent by the remote computer is %s. "
+	  message = g_strdup_printf (_("The identity of the remote host (%s) is unknown.\n"
+				       "This happens when you log in to a host the first time.\n\n"
+				       "The identity sent by the remote host is %s. "
 				       "If you want to be absolutely sure it is safe to continue, "
 				       "contact the system administrator."),
 				     hostname ? hostname : host, fingerprint);
diff --git a/vinagre/vinagre-ui.h b/vinagre/vinagre-ui.h
index 4e512d7..8e96642 100644
--- a/vinagre/vinagre-ui.h
+++ b/vinagre/vinagre-ui.h
@@ -30,19 +30,19 @@ G_BEGIN_DECLS
 static const GtkActionEntry vinagre_always_sensitive_entries[] =
 {
   /* Toplevel */
-  { "Machine", NULL, N_("_Machine") },
+  { "Remote", NULL, N_("_Remote") },
   { "Edit", NULL, N_("_Edit") },
   { "View", NULL, N_("_View") },
   { "Bookmarks", NULL, N_("_Bookmarks") },
   { "Help", NULL, N_("_Help") },
 
-  /* Machine menu */
-  { "MachineConnect", GTK_STOCK_CONNECT, NULL, "<control>N",
-    N_("Connect to a remote machine"), G_CALLBACK (vinagre_cmd_machine_connect) },
-  { "MachineOpen", GTK_STOCK_OPEN, NULL, "<control>O",
-    N_("Open a .VNC file"), G_CALLBACK (vinagre_cmd_machine_open) },
-  { "MachineQuit", GTK_STOCK_QUIT, NULL, "<control>Q",
-    N_("Quit the program"), G_CALLBACK (vinagre_cmd_machine_quit) },
+  /* Remote menu */
+  { "RemoteConnect", GTK_STOCK_CONNECT, NULL, "<control>N",
+    N_("Connect to a remote desktop"), G_CALLBACK (vinagre_cmd_remote_connect) },
+  { "RemoteOpen", GTK_STOCK_OPEN, NULL, "<control>O",
+    N_("Open a .VNC file"), G_CALLBACK (vinagre_cmd_remote_open) },
+  { "RemoteQuit", GTK_STOCK_QUIT, NULL, "<control>Q",
+    N_("Quit the program"), G_CALLBACK (vinagre_cmd_remote_quit) },
 
   /* Edit menu */
   { "EditPreferences", GTK_STOCK_PREFERENCES, NULL, NULL,
@@ -72,13 +72,13 @@ static const GtkToggleActionEntry vinagre_always_sensitive_toggle_entries[] =
     G_CALLBACK (vinagre_cmd_view_show_fav_panel), FALSE }
 };
 
-static const GtkActionEntry vinagre_machine_connected_entries[] =
+static const GtkActionEntry vinagre_remote_connected_entries[] =
 {
-  /* Machine menu */
-  { "MachineClose", GTK_STOCK_CLOSE, NULL, "<control>W",
-    N_("Close the current connection"), G_CALLBACK (vinagre_cmd_machine_close) },
-  { "MachineCloseAll", GTK_STOCK_CLOSE, N_("C_lose All"), "<control><shift>W",
-    N_("Close all active connections"), G_CALLBACK (vinagre_cmd_machine_close_all) },
+  /* 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) },
 
   /* Bookmarks menu */
   { "BookmarksAdd", GTK_STOCK_SAVE, N_("_Add to bookmarks"), "<control>D",
@@ -86,18 +86,18 @@ static const GtkActionEntry vinagre_machine_connected_entries[] =
 
 };
 
-static const GtkActionEntry vinagre_machine_initialized_entries[] =
+static const GtkActionEntry vinagre_remote_initialized_entries[] =
 {
-  /* Machine menu */
-  { "MachineTakeScreenshot", "applets-screenshooter", N_("_Take screenshot"), NULL,
-    N_("Take a screenshot of active connection"), G_CALLBACK (vinagre_cmd_machine_take_screenshot) },
+  /* Remote menu */
+  { "RemoteTakeScreenshot", "applets-screenshooter", N_("_Take screenshot"), NULL,
+    N_("Take a screenshot of active connection"), G_CALLBACK (vinagre_cmd_remote_take_screenshot) },
 
   /* View menu */
   { "ViewFullScreen", GTK_STOCK_FULLSCREEN, NULL, "F11",
-    N_("View the current machine in full screen"), G_CALLBACK (vinagre_cmd_view_fullscreen) }
+    N_("View the current remote desktop in full screen"), G_CALLBACK (vinagre_cmd_view_fullscreen) }
 };
 
-static const GtkToggleActionEntry vinagre_machine_initialized_toggle_entries[] =
+static const GtkToggleActionEntry vinagre_remote_initialized_toggle_entries[] =
 {
  {0,},
 };
diff --git a/vinagre/vinagre-window-private.h b/vinagre/vinagre-window-private.h
index c74cb9e..98c6201 100644
--- a/vinagre/vinagre-window-private.h
+++ b/vinagre/vinagre-window-private.h
@@ -44,8 +44,8 @@ struct _VinagreWindowPrivate
   GtkUIManager   *manager;
 
   GtkActionGroup *always_sensitive_action_group;
-  GtkActionGroup *machine_connected_action_group;
-  GtkActionGroup *machine_initialized_action_group;
+  GtkActionGroup *remote_connected_action_group;
+  GtkActionGroup *remote_initialized_action_group;
 
   GtkActionGroup *bookmarks_list_action_group;
   GtkActionGroup *recent_action_group;
diff --git a/vinagre/vinagre-window.c b/vinagre/vinagre-window.c
index 21862db..367bd3f 100644
--- a/vinagre/vinagre-window.c
+++ b/vinagre/vinagre-window.c
@@ -295,7 +295,7 @@ update_recent_connections (VinagreWindow *window)
 
   gtk_ui_manager_add_ui (p->manager,
 			 p->recents_menu_ui_id,
-			 "/MenuBar/MachineMenu/FileRecentsPlaceholder",
+			 "/MenuBar/RemoteMenu/FileRecentsPlaceholder",
 			 "recent_connections",
 			 "recent_connections",
 			 GTK_UI_MANAGER_MENUITEM,
@@ -366,32 +366,32 @@ create_menu_bar_and_toolbar (VinagreWindow *window,
   g_object_unref (action_group);
   window->priv->always_sensitive_action_group = action_group;
 
-  action = gtk_action_group_get_action (action_group, "MachineConnect");
+  action = gtk_action_group_get_action (action_group, "RemoteConnect");
   gtk_action_set_is_important (action, TRUE);
 
-  /* Machine connected actions */
-  action_group = gtk_action_group_new ("VinagreWindowMachineConnectedActions");
+  /* Remote connected actions */
+  action_group = gtk_action_group_new ("VinagreWindowRemoteConnectedActions");
   gtk_action_group_set_translation_domain (action_group, NULL);
   gtk_action_group_add_actions (action_group,
-				vinagre_machine_connected_entries,
-				G_N_ELEMENTS (vinagre_machine_connected_entries),
+				vinagre_remote_connected_entries,
+				G_N_ELEMENTS (vinagre_remote_connected_entries),
 				window);
   gtk_action_group_set_sensitive (action_group, FALSE);
   gtk_ui_manager_insert_action_group (manager, action_group, 0);
   g_object_unref (action_group);
-  window->priv->machine_connected_action_group = action_group;
+  window->priv->remote_connected_action_group = action_group;
 
-  /* Machine initialized actions */
-  action_group = gtk_action_group_new ("VinagreWindowMachineInitializedActions");
+  /* Remote initialized actions */
+  action_group = gtk_action_group_new ("VinagreWindowRemoteInitializedActions");
   gtk_action_group_set_translation_domain (action_group, NULL);
   gtk_action_group_add_actions (action_group,
-				vinagre_machine_initialized_entries,
-				G_N_ELEMENTS (vinagre_machine_initialized_entries),
+				vinagre_remote_initialized_entries,
+				G_N_ELEMENTS (vinagre_remote_initialized_entries),
 				window);
   gtk_action_group_set_sensitive (action_group, FALSE);
   gtk_ui_manager_insert_action_group (manager, action_group, 0);
   g_object_unref (action_group);
-  window->priv->machine_initialized_action_group = action_group;
+  window->priv->remote_initialized_action_group = action_group;
 
   /* now load the UI definition */
   gtk_ui_manager_add_ui_from_file (manager, vinagre_utils_get_ui_xml_filename (), &error);
@@ -726,7 +726,7 @@ vinagre_window_check_first_run (VinagreWindow *window)
 						  GTK_BUTTONS_CLOSE,
 						  _("About menu accelerators and keyboard shortcuts"));
       gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (dialog),
-						_("Vinagre comes with menu accelerators and keyboard shortcuts disabled by default. The reason is to avoid the keys to be intercepted by the program, and allow them to be sent to the remote machine.\n\nYou can change this behavior through the preferences dialog. For more information, check the documentation.\n\nThis message will appear only once."));     
+						_("Vinagre comes with menu accelerators and keyboard shortcuts disabled by default. The reason is to avoid the keys from being intercepted by the program, and allow them to be sent to the remote desktop.\n\nYou can change this behavior through the preferences dialog. For more information, check the documentation.\n\nThis message will appear only once."));
       gtk_dialog_run (GTK_DIALOG (dialog));
       gtk_widget_destroy (dialog);
 
@@ -971,7 +971,7 @@ vinagre_window_get_initialized_action (VinagreWindow *window)
 {
   g_return_val_if_fail (VINAGRE_IS_WINDOW (window), NULL);
 
-  return window->priv->machine_initialized_action_group;
+  return window->priv->remote_initialized_action_group;
 }
 
 /**
@@ -999,7 +999,7 @@ vinagre_window_get_connected_action (VinagreWindow *window)
 {
   g_return_val_if_fail (VINAGRE_IS_WINDOW (window), NULL);
 
-  return window->priv->machine_connected_action_group;
+  return window->priv->remote_connected_action_group;
 }
 
 /**
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]