1 files changed, 9 insertions, 8 deletions

diff --git a/vncviewer/vncviewer.cxx b/vncviewer/vncviewer.cxx
index 3db9bd64..324ec632 100644
--- a/vncviewer/vncviewer.cxx
+++ b/vncviewer/vncviewer.cxx
@@ -100,7 +100,7 @@ static const char *about_text()
   // encodings, so we need to make sure we get a fresh string every
   // time.
   snprintf(buffer, sizeof(buffer),
-           _("TigerVNC viewer v%s\n"
+           _("TigerVNC v%s\n"
              "Built on: %s\n"
              "Copyright (C) 1999-%d TigerVNC team and many others (see README.rst)\n"
              "See https://www.tigervnc.org for information on TigerVNC."),
@@ -170,7 +170,7 @@ bool should_disconnect()
 
 void about_vncviewer()
 {
-  fl_message_title(_("About TigerVNC Viewer"));
+  fl_message_title(_("About TigerVNC"));
   fl_message("%s", about_text());
 }
 
@@ -181,7 +181,8 @@ static void mainloop(const char* vncserver, network::Socket* sock)
 
     exitMainloop = false;
 
-    cc = new CConn(vncserver, sock);
+    cc = new CConn();
+    cc->connect(vncserver, sock);
 
     while (!exitMainloop) {
       int next_timer;
@@ -241,7 +242,7 @@ static void new_connection_cb(Fl_Widget* /*widget*/, void* /*data*/)
 
   pid = fork();
   if (pid == -1) {
-    vlog.error(_("Error starting new TigerVNC Viewer: %s"), strerror(errno));
+    vlog.error(_("Error starting new connection: %s"), strerror(errno));
     return;
   }
 
@@ -253,7 +254,7 @@ static void new_connection_cb(Fl_Widget* /*widget*/, void* /*data*/)
 
   execvp(argv[0], (char * const *)argv);
 
-  vlog.error(_("Error starting new TigerVNC Viewer: %s"), strerror(errno));
+  vlog.error(_("Error starting new connection: %s"), strerror(errno));
   _exit(1);
 }
 #endif
@@ -262,7 +263,7 @@ static void CleanupSignalHandler(int sig)
 {
   // CleanupSignalHandler allows C++ object cleanup to happen because it calls
   // exit() rather than the default which is to abort.
-  vlog.info(_("Termination signal %d has been received. TigerVNC viewer will now exit."), sig);
+  vlog.info(_("Termination signal %d has been received. TigerVNC will now exit."), sig);
   exit(1);
 }
 
@@ -387,7 +388,7 @@ static void init_fltk()
   fl_message_hotspot(false);
 
   // Avoid empty titles for popups
-  fl_message_title_default(_("TigerVNC viewer"));
+  fl_message_title_default("TigerVNC");
 
   // FLTK exposes these so that we can translate them.
   fl_no     = _("No");
@@ -464,7 +465,7 @@ static void usage(const char *programName)
   fprintf(stderr, _("\n"
           "Options:\n\n"
           "  -display Xdisplay  - Specifies the X display for the viewer window\n"
-          "  -geometry geometry - Initial position of the main VNC viewer window. See the\n"
+          "  -geometry geometry - Initial position of the main TigerVNC window. See the\n"
           "                       man page for details.\n"));
 #endif