Spelling: GTK, Disconnect after first session, Listen for TCP connections

(cherry picked from commit 9fe2c90c89922952434ac8bc19ec91ac3f8bba1d)

5 files changed, 35 insertions, 35 deletions

diff --git a/plugins/rdp/rdp_event.c b/plugins/rdp/rdp_event.c
index 07878c4a2..953cf87fc 100644
--- a/plugins/rdp/rdp_event.c
+++ b/plugins/rdp/rdp_event.c
@@ -1,5 +1,5 @@
 /*
- * Remmina - The GTK+ Remote Desktop Client
+ * Remmina - The GTK Remote Desktop Client
  * Copyright (C) 2010 Jay Sorg
  * Copyright (C) 2010-2011 Vic Lee
  * Copyright (C) 2011 Marc-Andre Moreau <marcandre.moreau@gmail.com>
@@ -290,13 +290,13 @@ static gboolean remmina_rdp_event_on_draw(GtkWidget* widget, cairo_t* context, R
 
 
 	if (rfi->is_reconnecting) {
-		/* freerdp is reconnecting, just show a message to the user */
+		/* FreeRDP is reconnecting, just show a message to the user */
 
 		width = gtk_widget_get_allocated_width(widget);
 		height = gtk_widget_get_allocated_height(widget);
 
 		/* Draw text */
-		msg = g_strdup_printf(_("Reconnection in progress. Attempt %d of %d…"),
+		msg = g_strdup_printf(_("Reconnection attempt %d of %d…"),
 			rfi->reconnect_nattempt, rfi->reconnect_maxattempts);
 
 		cairo_select_font_face(context, "Sans", CAIRO_FONT_SLANT_NORMAL, CAIRO_FONT_WEIGHT_BOLD);
@@ -308,7 +308,7 @@ static gboolean remmina_rdp_event_on_draw(GtkWidget* widget, cairo_t* context, R
 		g_free(msg);
 
 	}else  {
-		/* Standard drawing: we copy the surface from RDP */
+		/* Standard drawing: We copy the surface from RDP */
 
 		if (!rfi->surface)
 			return FALSE;
@@ -668,18 +668,18 @@ static gboolean remmina_rdp_event_on_key(GtkWidget* widget, GdkEventKey* event,
 			}
 		} else {
 			unicode_keyval = gdk_keyval_to_unicode(event->keyval);
-			/* Decide when whe should send a keycode or a unicode character.
-			 * - All non char keys (shift, alt, win) should be sent as keycode
+			/* Decide when whe should send a keycode or a Unicode character.
+			 * - All non char keys (Shift, Alt, Super) should be sent as keycode
 			 * - Space should be sent as keycode (see issue #1364)
-			 * - All special keys (F1-F10, numeric pad, home/end/arrows/pgup/pgdn/ins/del) keycode
-			 * - All key pressed while CTRL or ALT or WIN is down are not decoded by gdk_keyval_to_unicode(), so send it as keycode
+			 * - All special keys (F1-F10, numeric pad, Home/End/Arrows/PgUp/PgDn/Insert/Delete) keycode
+			 * - All key pressed while Ctrl or Alt or Super is down are not decoded by gdk_keyval_to_unicode(), so send it as keycode
 			 * - All keycodes not translatable to unicode chars, as keycode
-			 * - The rest as unicode char
+			 * - The rest as Unicode char
 			 */
-			if (event->keyval >= 0xfe00 ||                                                  // arrows, shift, alt, Fn, num keypad…
-				event->hardware_keycode == 0x41 ||											// space bar
-			    unicode_keyval == 0 ||                                                      // impossible to translate
-			    (event->state & (GDK_MOD1_MASK | GDK_CONTROL_MASK | GDK_SUPER_MASK)) != 0   // a modifier not recognized by gdk_keyval_to_unicode()
+			if (event->keyval >= 0xfe00 ||                                                  // Arrows, Shift, Alt, Fn, num keypad…
+				event->hardware_keycode == 0x41 ||											// Spacebar
+			    unicode_keyval == 0 ||                                                      // Impossible to translate
+			    (event->state & (GDK_MOD1_MASK | GDK_CONTROL_MASK | GDK_SUPER_MASK)) != 0   // A modifier not recognized by gdk_keyval_to_unicode()
 			    ) {
 				scancode = freerdp_keyboard_get_rdp_scancode_from_x11_keycode(event->hardware_keycode);
 				rdp_event.key_event.key_code = scancode & 0xFF;
diff --git a/plugins/rdp/rdp_plugin.c b/plugins/rdp/rdp_plugin.c
index cd4ca39c0..ca932ab80 100644
--- a/plugins/rdp/rdp_plugin.c
+++ b/plugins/rdp/rdp_plugin.c
@@ -1880,18 +1880,18 @@ static const RemminaProtocolSetting remmina_rdp_advanced_settings[] =
 	{ REMMINA_PROTOCOL_SETTING_TYPE_SELECT,	  "sound",		    N_("Sound"),			     FALSE, sound_list,	   NULL														  },
 	{ REMMINA_PROTOCOL_SETTING_TYPE_SELECT,	  "security",		    N_("Security"),			     FALSE, security_list, NULL														  },
 	{ REMMINA_PROTOCOL_SETTING_TYPE_SELECT,	  "gwtransp",		    N_("Gateway transport type"),	     FALSE, gwtransp_list, NULL														  },
-	{ REMMINA_PROTOCOL_SETTING_TYPE_TEXT,	  "gateway_server",	    N_("RD Gateway server"),		     FALSE, NULL,	   NULL														  },
-	{ REMMINA_PROTOCOL_SETTING_TYPE_TEXT,	  "gateway_username",	    N_("RD Gateway username"),		     FALSE, NULL,	   NULL														  },
-	{ REMMINA_PROTOCOL_SETTING_TYPE_PASSWORD, "gateway_password",	    N_("RD Gateway password"),		     FALSE, NULL,	   NULL														  },
-	{ REMMINA_PROTOCOL_SETTING_TYPE_TEXT,	  "gateway_domain",	    N_("RD Gateway domain"),		     FALSE, NULL,	   NULL														  },
+	{ REMMINA_PROTOCOL_SETTING_TYPE_TEXT,	  "gateway_server",	    N_("Remote Desktop Gateway server"),		     FALSE, NULL,	   NULL														  },
+	{ REMMINA_PROTOCOL_SETTING_TYPE_TEXT,	  "gateway_username",	    N_("Remote Desktop Gateway username"),		     FALSE, NULL,	   NULL														  },
+	{ REMMINA_PROTOCOL_SETTING_TYPE_PASSWORD, "gateway_password",	    N_("Remote Desktop Gateway password"),		     FALSE, NULL,	   NULL														  },
+	{ REMMINA_PROTOCOL_SETTING_TYPE_TEXT,	  "gateway_domain",	    N_("Remote Desktop Gateway domain"),		     FALSE, NULL,	   NULL														  },
 	{ REMMINA_PROTOCOL_SETTING_TYPE_TEXT,	  "clientname",		    N_("Client name"),			     FALSE, NULL,	   NULL														  },
 	{ REMMINA_PROTOCOL_SETTING_TYPE_TEXT,	  "exec",		    N_("Startup program"),		     FALSE, NULL,	   NULL														  },
 	{ REMMINA_PROTOCOL_SETTING_TYPE_TEXT,	  "execpath",		    N_("Startup path"),			     FALSE, NULL,	   NULL														  },
 	{ REMMINA_PROTOCOL_SETTING_TYPE_TEXT,	  "loadbalanceinfo",	    N_("Load balance info"),		     FALSE, NULL,	   NULL														  },
 	{ REMMINA_PROTOCOL_SETTING_TYPE_TEXT,	  "printer_overrides",	    N_("Override Printer Drivers"),	     FALSE, NULL,	   N_("\"Samsung_CLX-3300_Series\":\"Samsung CLX-3300 Series PS\";\"Canon MF410\":\"Canon MF410 Series UFR II\"") },
-	{ REMMINA_PROTOCOL_SETTING_TYPE_TEXT,	  "serialname",		    N_("Local serial name"),		     FALSE, NULL,	   N_("COM1, COM2, etc")											  },
+	{ REMMINA_PROTOCOL_SETTING_TYPE_TEXT,	  "serialname",		    N_("Local serial name"),		     FALSE, NULL,	   N_("COM1, COM2, etc.")											  },
 	{ REMMINA_PROTOCOL_SETTING_TYPE_TEXT,	  "serialdriver",	    N_("Local serial driver"),		     FALSE, NULL,	   N_("Serial")													  },
-	{ REMMINA_PROTOCOL_SETTING_TYPE_TEXT,	  "serialpath",		    N_("Local serial path"),		     FALSE, NULL,	   N_("/dev/ttyS0, /dev/ttyS1, etc")										  },
+	{ REMMINA_PROTOCOL_SETTING_TYPE_TEXT,	  "serialpath",		    N_("Local serial path"),		     FALSE, NULL,	   N_("/dev/ttyS0, /dev/ttyS1, etc.")										  },
 	{ REMMINA_PROTOCOL_SETTING_TYPE_TEXT,	  "parallelname",	    N_("Local parallel name"),		     FALSE, NULL,	   NULL														  },
 	{ REMMINA_PROTOCOL_SETTING_TYPE_TEXT,	  "parallelpath",	    N_("Local parallel device"),	     FALSE, NULL,	   NULL														  },
 	{ REMMINA_PROTOCOL_SETTING_TYPE_TEXT,	  "smartcardname",	    N_("Smartcard Name"),		     FALSE, NULL,	   NULL														  },
@@ -1901,16 +1901,16 @@ static const RemminaProtocolSetting remmina_rdp_advanced_settings[] =
 	{ REMMINA_PROTOCOL_SETTING_TYPE_CHECK,	  "shareparallel",	    N_("Share parallel ports"),		     TRUE,  NULL,	   NULL														  },
 	{ REMMINA_PROTOCOL_SETTING_TYPE_CHECK,	  "sharesmartcard",	    N_("Share smartcard"),		     TRUE,  NULL,	   NULL														  },
 	{ REMMINA_PROTOCOL_SETTING_TYPE_CHECK,	  "microphone",		    N_("Redirect local microphone"),	     TRUE,  NULL,	   NULL														  },
-	{ REMMINA_PROTOCOL_SETTING_TYPE_CHECK,	  "disableclipboard",	    N_("Disable clipboard sync"),	     TRUE,  NULL,	   NULL														  },
+	{ REMMINA_PROTOCOL_SETTING_TYPE_CHECK,	  "disableclipboard",	    N_("Turn off clipboard sync"),	     TRUE,  NULL,	   NULL														  },
 	{ REMMINA_PROTOCOL_SETTING_TYPE_CHECK,	  "cert_ignore",	    N_("Ignore certificate"),		     TRUE,  NULL,	   NULL														  },
-	{ REMMINA_PROTOCOL_SETTING_TYPE_CHECK,	  "disablepasswordstoring", N_("Disable password storing"),	     TRUE,  NULL,	   NULL														  },
+	{ REMMINA_PROTOCOL_SETTING_TYPE_CHECK,	  "disablepasswordstoring", N_("Turn off password storing"),	     TRUE,  NULL,	   NULL														  },
 	{ REMMINA_PROTOCOL_SETTING_TYPE_CHECK,	  "console",		    N_("Attach to console (2003/2003 R2)"),  TRUE,  NULL,	   NULL														  },
-	{ REMMINA_PROTOCOL_SETTING_TYPE_CHECK,	  "disable_fastpath",	    N_("Disable fast-path"),		     TRUE,  NULL,	   NULL														  },
-	{ REMMINA_PROTOCOL_SETTING_TYPE_CHECK,	  "gateway_usage",	    N_("Server detection using RD Gateway"), TRUE,  NULL,	   NULL														  },
+	{ REMMINA_PROTOCOL_SETTING_TYPE_CHECK,	  "disable_fastpath",	    N_("Turn off fast-path"),		     TRUE,  NULL,	   NULL														  },
+	{ REMMINA_PROTOCOL_SETTING_TYPE_CHECK,	  "gateway_usage",	    N_("Server detection using Remote Desktop Gateway"), TRUE,  NULL,	   NULL														  },
 #if defined(PROXY_TYPE_IGNORE)
-	{ REMMINA_PROTOCOL_SETTING_TYPE_CHECK,	  "enableproxy",	    N_("Enable proxy support"),		     TRUE,  NULL,	   NULL														  },
+	{ REMMINA_PROTOCOL_SETTING_TYPE_CHECK,	  "enableproxy",	    N_("Turn on proxy support"),		     TRUE,  NULL,	   NULL														  },
 #endif
-	{ REMMINA_PROTOCOL_SETTING_TYPE_CHECK,	  "disableautoreconnect",   N_("Disable automatic reconnection"),    TRUE,  NULL,	   NULL														  },
+	{ REMMINA_PROTOCOL_SETTING_TYPE_CHECK,	  "disableautoreconnect",   N_("Turn off automatic reconnection"),    TRUE,  NULL,	   NULL														  },
 	{ REMMINA_PROTOCOL_SETTING_TYPE_CHECK,	  "relax-order-checks",	    N_("Relax Order Checks"),		     TRUE,  NULL,	   NULL														  },
 	{ REMMINA_PROTOCOL_SETTING_TYPE_CHECK,	  "glyph-cache",	    N_("Glyph Cache"),			     TRUE,  NULL,	   NULL														  },
 	{ REMMINA_PROTOCOL_SETTING_TYPE_END,	  NULL,			    NULL,				     FALSE, NULL,	   NULL														  }
diff --git a/plugins/spice/spice_plugin_file_transfer.c b/plugins/spice/spice_plugin_file_transfer.c
index 9c14c8dd6..ada7153f5 100644
--- a/plugins/spice/spice_plugin_file_transfer.c
+++ b/plugins/spice/spice_plugin_file_transfer.c
@@ -221,7 +221,7 @@ static void remmina_plugin_spice_file_transfer_finished_cb(SpiceFileTransferTask
 			filename, error->message);
 	}else  {
 		notification = g_notification_new(_("Transfer completed"));
-		notification_message = g_strdup_printf(_("File %s transferred successfully"),
+		notification_message = g_strdup_printf(_("The %s file has been transferred"),
 			filename);
 	}
 
diff --git a/plugins/www/www_plugin.c b/plugins/www/www_plugin.c
index 5a858f6b1..c7465132c 100644
--- a/plugins/www/www_plugin.c
+++ b/plugins/www/www_plugin.c
@@ -797,15 +797,15 @@ static const RemminaProtocolSetting remmina_plugin_www_basic_settings[] =
  */
 static const RemminaProtocolSetting remmina_plugin_www_advanced_settings[] =
 {
-	{ REMMINA_PROTOCOL_SETTING_TYPE_TEXT,  "user-agent",		    N_("User Agent"),		       FALSE, NULL, NULL },
+	{ REMMINA_PROTOCOL_SETTING_TYPE_TEXT,  "user-agent",		    N_("User agent"),		       FALSE, NULL, NULL },
 	{ REMMINA_PROTOCOL_SETTING_TYPE_CHECK, "enable-java",		    N_("Turn on Java support"),	       TRUE,  NULL, NULL },
 	{ REMMINA_PROTOCOL_SETTING_TYPE_CHECK, "enable-smooth-scrolling",   N_("Turn on smooth scrolling"),     TRUE,  NULL, NULL },
 	{ REMMINA_PROTOCOL_SETTING_TYPE_CHECK, "enable-spatial-navigation", N_("Turn on Spatial Navigation"),   TRUE,  NULL, NULL },
 	{ REMMINA_PROTOCOL_SETTING_TYPE_CHECK, "enable-plugins",	    N_("Turn on plugin support"),  TRUE,  NULL, NULL },
 	{ REMMINA_PROTOCOL_SETTING_TYPE_CHECK, "enable-webgl",		    N_("Turn on WebGL support"),    TRUE,  NULL, NULL },
-	{ REMMINA_PROTOCOL_SETTING_TYPE_CHECK, "enable-webaudio",	    N_("Turn on WebAudio support"), TRUE,  NULL, NULL },
+	{ REMMINA_PROTOCOL_SETTING_TYPE_CHECK, "enable-webaudio",	    N_("Turn on HTML5 audio support"), TRUE,  NULL, NULL },
 	{ REMMINA_PROTOCOL_SETTING_TYPE_CHECK, "ignore-tls-errors",	    N_("Ignore TLS errors"),	       TRUE,  NULL, NULL },
-	{ REMMINA_PROTOCOL_SETTING_TYPE_CHECK, "disablepasswordstoring",    N_("No password storing"),    TRUE,  NULL, NULL },
+	{ REMMINA_PROTOCOL_SETTING_TYPE_CHECK, "disablepasswordstoring",    N_("No password storage"),    TRUE,  NULL, NULL },
 #ifdef DEBUG
 	{ REMMINA_PROTOCOL_SETTING_TYPE_CHECK, "enable-webinspector",	    N_("Turn on Web Inspector"),	       TRUE,  NULL, NULL },
 #endif
diff --git a/plugins/xdmcp/xdmcp_plugin.c b/plugins/xdmcp/xdmcp_plugin.c
index cbbaa685d..ac8109f07 100644
--- a/plugins/xdmcp/xdmcp_plugin.c
+++ b/plugins/xdmcp/xdmcp_plugin.c
@@ -1,5 +1,5 @@
 /*
- * Remmina - The GTK+ Remote Desktop Client
+ * Remmina - The GTK Remote Desktop Client
  * Copyright (C) 2010 Vic Lee
  * Copyright (C) 2014-2015 Antenore Gatta, Fabio Castelli, Giovanni Panozzo
  * Copyright (C) 2016-2019 Antenore Gatta, Giovanni Panozzo
@@ -129,7 +129,7 @@ static gboolean remmina_plugin_xdmcp_start_xephyr(RemminaProtocolWidget *gp)
 	if (remmina_plugin_service->file_get_int(remminafile, "once", FALSE)) {
 		argv[argc++] = g_strdup("-once");
 	}
-	/* Listen on protocol TCP */
+	/* Listen on TCP protocol */
 	if (remmina_plugin_service->file_get_int(remminafile, "listen_on_tcp", FALSE)) {
 		argv[argc++] = g_strdup("-listen");
 		argv[argc++] = g_strdup("tcp");
@@ -147,8 +147,8 @@ static gboolean remmina_plugin_xdmcp_start_xephyr(RemminaProtocolWidget *gp)
 			argv[argc++] = g_strdup_printf("%i", i);
 		}
 	}else  {
-		/* When the connection is through an SSH tunnel, it connects back to local unix socket,
-		 * so for security we can disable tcp listening */
+		/* When the connection is through an SSH tunnel, it connects back to local Unix socket,
+		 * so for security we can disable TCP listening */
 		argv[argc++] = g_strdup("-nolisten");
 		argv[argc++] = g_strdup("tcp");
 
@@ -369,8 +369,8 @@ static const RemminaProtocolSetting remmina_plugin_xdmcp_basic_settings[] =
 	{ REMMINA_PROTOCOL_SETTING_TYPE_SELECT,	    "colordepth",    N_("Color depth"),				 FALSE, colordepth_list, NULL },
 	{ REMMINA_PROTOCOL_SETTING_TYPE_TEXT,	    "exec",	     N_("Startup program"),			 FALSE, NULL,		 NULL },
 	{ REMMINA_PROTOCOL_SETTING_TYPE_CHECK,	    "showcursor",    N_("Use local cursor"),			 FALSE, NULL,		 NULL },
-	{ REMMINA_PROTOCOL_SETTING_TYPE_CHECK,	    "once",	     N_("Disconnect after one session"),	 FALSE, NULL,		 NULL },
-	{ REMMINA_PROTOCOL_SETTING_TYPE_CHECK,	    "listen_on_tcp", N_("Listening connection on protocol TCP"), FALSE, NULL,		 NULL },
+	{ REMMINA_PROTOCOL_SETTING_TYPE_CHECK,	    "once",	     N_("Disconnect after first session"),	 FALSE, NULL,		 NULL },
+	{ REMMINA_PROTOCOL_SETTING_TYPE_CHECK,	    "listen_on_tcp", N_("Listen for TCP connections"), FALSE, NULL,		 NULL },
 	{ REMMINA_PROTOCOL_SETTING_TYPE_END,	    NULL,	     NULL,					 FALSE, NULL,		 NULL }
 };