diff --git a/src/remote-viewer.c b/src/remote-viewer.c
index 2450096..3566cef 100644
--- a/src/remote-viewer.c
+++ b/src/remote-viewer.c
@@ -426,7 +426,7 @@ create_ovirt_session(VirtViewerApp *app, const char *uri, GError **err)
 
     if (!parse_ovirt_uri(uri, &rest_uri, &vm_name, &username)) {
         g_set_error_literal(&error, VIRT_VIEWER_ERROR, VIRT_VIEWER_ERROR_FAILED,
-                            _("failed to parse ovirt uri"));
+                            _("failed to parse oVirt URI"));
         goto error;
     }
 
diff --git a/src/virt-viewer-app.c b/src/virt-viewer-app.c
index c4a394f..405628c 100644
--- a/src/virt-viewer-app.c
+++ b/src/virt-viewer-app.c
@@ -852,7 +852,7 @@ virt_viewer_app_open_unix_sock(const char *unixsock, GError **error)
 
     if (strlen(unixsock) + 1 > sizeof(addr.sun_path)) {
         g_set_error(error, VIRT_VIEWER_ERROR, VIRT_VIEWER_ERROR_FAILED,
-                    _("Address is too long for unix socket_path: %s"), unixsock);
+                    _("Address is too long for UNIX socket_path: %s"), unixsock);
         return -1;
     }
 
@@ -862,13 +862,13 @@ virt_viewer_app_open_unix_sock(const char *unixsock, GError **error)
 
     if ((fd = socket(AF_UNIX, SOCK_STREAM, 0)) < 0) {
         g_set_error(error, VIRT_VIEWER_ERROR, VIRT_VIEWER_ERROR_FAILED,
-                    _("Creating unix socket failed: %s"), g_strerror(errno));
+                    _("Creating UNIX socket failed: %s"), g_strerror(errno));
         return -1;
     }
 
     if (connect(fd, (struct sockaddr *)&addr, sizeof addr) < 0) {
         g_set_error(error, VIRT_VIEWER_ERROR, VIRT_VIEWER_ERROR_FAILED,
-                    _("Connecting to unix socket failed: %s"), g_strerror(errno));
+                    _("Connecting to UNIX socket failed: %s"), g_strerror(errno));
         close(fd);
         return -1;
     }
@@ -1367,7 +1367,7 @@ virt_viewer_app_channel_open(VirtViewerSession *session,
         !priv->direct && fd == -1) {
         if ((fd = virt_viewer_app_open_tunnel_ssh(priv->host, priv->port, priv->user,
                                                   priv->ghost, priv->gport, priv->unixsock)) < 0) {
-            error_message = g_strdup(_("Connect to ssh failed."));
+            error_message = g_strdup(_("Connect to SSH failed."));
             g_debug("channel open ssh tunnel: %s", error_message);
         }
     }
@@ -1384,7 +1384,7 @@ virt_viewer_app_channel_open(VirtViewerSession *session,
     if (fd < 0) {
         virt_viewer_app_simple_message_dialog(self, _("Can't connect to channel: %s"),
                                               (error_message != NULL) ? error_message :
-                                              _("only SSH or unix socket connection supported."));
+                                              _("only SSH or UNIX socket connection supported."));
         g_free(error_message);
         return;
     }
diff --git a/src/virt-viewer.c b/src/virt-viewer.c
index 8294ff1..08bd634 100644
--- a/src/virt-viewer.c
+++ b/src/virt-viewer.c
@@ -140,9 +140,9 @@ virt_viewer_add_option_entries(VirtViewerApp *self, GOptionContext *context, GOp
         { "domain-name", '\0', G_OPTION_FLAG_NO_ARG, G_OPTION_ARG_CALLBACK, opt_domain_selection_cb,
           N_("Select the virtual machine only by its name"), NULL },
         { "id", '\0', G_OPTION_FLAG_NO_ARG, G_OPTION_ARG_CALLBACK, opt_domain_selection_cb,
-          N_("Select the virtual machine only by its id"), NULL },
+          N_("Select the virtual machine only by its ID"), NULL },
         { "uuid", '\0', G_OPTION_FLAG_NO_ARG, G_OPTION_ARG_CALLBACK, opt_domain_selection_cb,
-          N_("Select the virtual machine only by its uuid"), NULL },
+          N_("Select the virtual machine only by its UUID"), NULL },
         { G_OPTION_REMAINING, '\0', 0, G_OPTION_ARG_STRING_ARRAY, &opt_args,
           NULL, "-- ID|UUID|DOMAIN-NAME" },
         { NULL, 0, 0, G_OPTION_ARG_NONE, NULL, NULL, NULL }