[vino] Use ‘Desktop Sharing’ rather than ‘Remote Desktop’

[David King <davidk src gnome org>]

commit ba5d54b2f0b535db29b59341e4506a4bcdd92844
Author: David King <amigadave amigadave com>
Date:   Thu Apr 28 20:38:24 2011 +0200

    Use â??Desktop Sharingâ?? rather than â??Remote Desktopâ??
    
    As pointed out in bug 625623, Vino deals with sharing a desktop of a
    current session, not starting a session and providing a remote desktop.

 capplet/vino-preferences.desktop.in.in |    4 ++--
 capplet/vino-preferences.ui            |    2 +-
 common/org.gnome.Vino.gschema.xml.in   |    6 +++---
 server/vino-main.c                     |    8 ++++----
 server/vino-prefs.c                    |    4 ++--
 server/vino-server.desktop.in.in       |    4 ++--
 vino.doap                              |    3 ++-
 7 files changed, 16 insertions(+), 15 deletions(-)
---
diff --git a/capplet/vino-preferences.desktop.in.in b/capplet/vino-preferences.desktop.in.in
index a57dec5..0a8aaf8 100644
--- a/capplet/vino-preferences.desktop.in.in
+++ b/capplet/vino-preferences.desktop.in.in
@@ -1,5 +1,5 @@
 [Desktop Entry]
-_Name=Remote Desktop
+_Name=Desktop Sharing
 _Comment=Choose how other users can remotely view your desktop
 Exec=vino-preferences
 Icon=preferences-desktop-remote-desktop
@@ -11,4 +11,4 @@ OnlyShowIn=GNOME;
 X-GNOME-Bugzilla-Bugzilla=GNOME
 X-GNOME-Bugzilla-Product=vino
 X-GNOME-Bugzilla-Component=Preferences Dialog
-X-GNOME-Bugzilla-Version= VERSION@
+X-GNOME-Bugzilla-Version= PACKAGE_VERSION@
diff --git a/capplet/vino-preferences.ui b/capplet/vino-preferences.ui
index e76e7d1..b41bd6a 100644
--- a/capplet/vino-preferences.ui
+++ b/capplet/vino-preferences.ui
@@ -5,7 +5,7 @@
   <object class="GtkDialog" id="vino_dialog">
     <property name="visible">True</property>
     <property name="border_width">5</property>
-    <property name="title" translatable="yes">Remote Desktop Preferences</property>
+    <property name="title" translatable="yes">Desktop Sharing Preferences</property>
     <property name="resizable">False</property>
     <property name="window_position">center-on-parent</property>
     <property name="icon_name">preferences-desktop-remote-desktop</property>
diff --git a/common/org.gnome.Vino.gschema.xml.in b/common/org.gnome.Vino.gschema.xml.in
index 53de091..ec1f472 100644
--- a/common/org.gnome.Vino.gschema.xml.in
+++ b/common/org.gnome.Vino.gschema.xml.in
@@ -1,11 +1,11 @@
 <schemalist>
   <schema id='org.gnome.Vino' path='/desktop/gnome/remote-access/'>
     <key name='enabled' type='b'>
-      <_summary>Enable remote desktop access</_summary>
+      <_summary>Enable remote access to the desktop</_summary>
       <_description>
         If true, allows remote access to the desktop via the RFB
         protocol. Users on remote machines may then connect to the
-        desktop using a vncviewer.  </_description>
+        desktop using a VNC viewer.</_description>
       <default>false</default>
     </key>
 
@@ -108,7 +108,7 @@
       <_description>
         This key specifies the e-mail address to which the remote
         desktop URL should be sent if the user clicks on the URL in the
-        Remote Desktop preferences dialog.
+        Desktop Sharing preferences dialog.
       </_description>
       <default>''</default>
     </key>
diff --git a/server/vino-main.c b/server/vino-main.c
index 1fba117..ced20ea 100644
--- a/server/vino-main.c
+++ b/server/vino-main.c
@@ -64,7 +64,7 @@ enabled_changed (VinoApplication *vino)
 {
   if (!g_settings_get_boolean (vino->settings, "enabled"))
     {
-      g_message ("The remote desktop service has been disabled.  Exiting.");
+      g_message ("The desktop sharing service has been disabled, exiting.");
       g_main_loop_quit (vino->main_loop);
     }
 }
@@ -172,7 +172,7 @@ name_lost (GDBusConnection *connection,
 {
   VinoApplication *vino = user_data;
 
-  g_message ("The remote desktop service is already running.  Exiting.");
+  g_message ("The desktop sharing service is already running, exiting.");
   g_main_loop_quit (vino->main_loop);
 }
 
@@ -217,13 +217,13 @@ main (int argc, char **argv)
                             G_CALLBACK (enabled_changed), &vino);
   if (!g_settings_get_boolean (vino.settings, "enabled"))
     {
-      g_warning ("The remote desktop service is not "
+      g_warning ("The desktop sharing service is not "
                  "enabled, so it should not be run.");
       return 1;
     }
 
   gtk_window_set_default_icon_name ("preferences-desktop-remote-desktop");
-  g_set_application_name (_("GNOME Remote Desktop"));
+  g_set_application_name (_("GNOME Desktop Sharing"));
   vino.main_loop = g_main_loop_new (NULL, FALSE);
 
 #ifdef GNOME_ENABLE_DEBUG
diff --git a/server/vino-prefs.c b/server/vino-prefs.c
index 87d8df0..b3792e1 100644
--- a/server/vino-prefs.c
+++ b/server/vino-prefs.c
@@ -106,7 +106,7 @@ vino_prefs_create_server (GdkScreen *screen)
 static void
 vino_prefs_sighandler (int sig)
 {
-  g_message (_("Received signal %d, exiting...\n"), sig);
+  g_message (_("Received signal %d, exiting."), sig);
   vino_mdns_shutdown ();
   vino_prefs_shutdown ();
   exit (0);
@@ -117,7 +117,7 @@ notify_enabled (void)
 {
   if (!g_settings_get_boolean (settings, "enabled"))
     {
-      g_message ("The remote desktop service is disabled.  Exiting.");
+      g_message ("The desktop sharing service is disabled, exiting.");
       exit (0);
     }
 }
diff --git a/server/vino-server.desktop.in.in b/server/vino-server.desktop.in.in
index b8e4aa6..339221a 100644
--- a/server/vino-server.desktop.in.in
+++ b/server/vino-server.desktop.in.in
@@ -1,6 +1,6 @@
 [Desktop Entry]
-_Name=Remote Desktop
-_Comment=GNOME Remote Desktop Server
+_Name=Desktop Sharing
+_Comment=GNOME Desktop Sharing Server
 Exec= LIBEXECDIR@/vino-server
 Icon=preferences-desktop-remote-desktop
 OnlyShowIn=GNOME;
diff --git a/vino.doap b/vino.doap
index 01b2e96..2f332a9 100644
--- a/vino.doap
+++ b/vino.doap
@@ -5,7 +5,7 @@
          xmlns="http://usefulinc.com/ns/doap#";>
 
   <name xml:lang="en">Vino</name>
-  <shortdesc xml:lang="en">GNOME Remote Desktop Server</shortdesc>
+  <shortdesc xml:lang="en">GNOME Desktop Sharing Server</shortdesc>
   <description>Vino is a Virtual Network Computing (VNC) server for GNOME, that
   allows you to share your desktop with remote clients.</description>
   <homepage rdf:resource="http://live.gnome.org/Vino"; />
@@ -18,6 +18,7 @@
     <foaf:Person>
       <foaf:name>David King</foaf:name>
       <foaf:mbox rdf:resource="mailto:amigadave amigadave com" />
+      <foaf:seeAlso rdf:resource="http://amigadave.com/foaf.rdf#david"; />
       <gnome:userid>davidk</gnome:userid>
     </foaf:Person>
   </maintainer>