[vino] Fix Bug 330691 – show .local hostname if avahi is present

[Jonh Wendell <jwendell src gnome org>]

commit 5dd9434bd59d7fd606ff4f6c4cbb6ece4ce7a72b
Author: Jonh Wendell <jwendell gnome org>
Date:   Fri Jun 19 23:43:19 2009 -0300

    Fix Bug 330691 â?? show .local hostname if avahi is present

 capplet/vino-preferences.c |   11 ++++++++---
 1 files changed, 8 insertions(+), 3 deletions(-)
---
diff --git a/capplet/vino-preferences.c b/capplet/vino-preferences.c
index c217687..7c6f1b6 100644
--- a/capplet/vino-preferences.c
+++ b/capplet/vino-preferences.c
@@ -847,11 +847,13 @@ error_message (VinoPreferencesDialog *dialog)
       avahi_host = NULL;
     }
 
-  
   g_string_append_printf (url, "<a href=\"vnc://%s::%d\">%s</a>", host, dialog->port, host);
 
   if (avahi_host && avahi_host[0])
-    g_string_append_printf (url, " , <a href=\"vnc://%s::%d\">%s</a>", avahi_host, dialog->port, avahi_host);
+    {
+      g_string_append (url, _(" or "));
+      g_string_append_printf (url, "<a href=\"vnc://%s::%d\">%s</a>", avahi_host, dialog->port, avahi_host);
+    }
 
   g_string_append_c (message, ' ');
   g_string_append_printf (message, _("Others can access your computer using the address %s."), url->str);
@@ -923,7 +925,10 @@ got_status (SoupSession *session, SoupMessage *msg, VinoPreferencesDialog *dialo
 	  g_string_append_printf (url, "<a href=\"vnc://%s::%d\">%s</a>", ip, dialog->port, ip);
 
 	  if (avahi_host && avahi_host[0])
-	    g_string_append_printf (url, " , <a href=\"vnc://%s::%d\">%s</a>", avahi_host, port, avahi_host);
+	    {
+	      g_string_append (url, _(" or "));
+	      g_string_append_printf (url, "<a href=\"vnc://%s::%d\">%s</a>", avahi_host, port, avahi_host);
+	    }
 
 	  message = g_strdup_printf (_("Others can access your computer using the address %s."), url->str);
 	  vino_message_box_hide_image (VINO_MESSAGE_BOX (dialog->message));