Spelling: Private key, direct explanations

4 files changed, 32 insertions, 32 deletions

diff --git a/src/remmina.c b/src/remmina.c
index 371730ef8..6a11ca388 100644
--- a/src/remmina.c
+++ b/src/remmina.c
@@ -110,7 +110,7 @@ static GOptionEntry remmina_options[] =
 	// TRANSLATORS: Shown in terminal. Do not use charcters that may be not supported on a terminal
 	{ "full-version",     'V',  0,			  G_OPTION_ARG_NONE,	       NULL, N_("Show version of the application and its plugins"),		     NULL	},
 	// TRANSLATORS: Shown in terminal. Do not use charcters that may be not supported on a terminal
-	{ "update-profile",   0,    0,			  G_OPTION_ARG_FILENAME,       NULL, N_("Modify connection profile, (requires --set-option)"),			     NULL	},
+	{ "update-profile",   0,    0,			  G_OPTION_ARG_FILENAME,       NULL, N_("Modify connection profile (requires --set-option)"),			     NULL	},
 	// TRANSLATORS: Shown in terminal. Do not use charcters that may be not supported on a terminal
 	{ "set-option",	      0,    0,			  G_OPTION_ARG_STRING_ARRAY,   NULL, N_("Set one or more profile settings, to be used with --update-profile"),		     NULL	},
 	{ NULL }
@@ -250,10 +250,10 @@ static void remmina_on_startup(GApplication *app)
 	 * something is missing */
 	secret_plugin = remmina_plugin_manager_get_secret_plugin();
 	if (!secret_plugin) {
-		g_print("WARNING: Remmina is running without a secret plugin. Passwords will be saved in a less secure way.\n");
+		g_print("Warning: Remmina is running without a secret plugin. Passwords will be saved in a less secure way.\n");
 	} else {
 		if (!secret_plugin->is_service_available())
-			g_print("WARNING: Remmina is running with a secret plugin, but it cannot connect to a secret service.\n");
+			g_print("Warning: Remmina is running with a secrecy plugin, but it cannot connect to a secrecy service.\n");
 	}
 
 	remmina_exec_command(REMMINA_COMMAND_AUTOSTART, NULL);
diff --git a/src/remmina_file_editor.c b/src/remmina_file_editor.c
index 3d39b7123..41b5574a2 100644
--- a/src/remmina_file_editor.c
+++ b/src/remmina_file_editor.c
@@ -917,7 +917,7 @@ static void remmina_file_editor_create_ssh_tab(RemminaFileEditor *gfe, RemminaPr
 								_("Username"), NULL);
 			row++;
 		}
-		widget = gtk_radio_button_new_with_label(NULL, _("SSH Agent (automatic)"));
+		widget = gtk_radio_button_new_with_label(NULL, _("SSH agent (automatic)"));
 		gtk_grid_attach(GTK_GRID(grid), widget, 0, row + 19, 1, 1);
 		priv->ssh_auth_agent_radio = widget;
 		row++;
@@ -991,7 +991,7 @@ static void remmina_file_editor_create_all_settings(RemminaFileEditor *gfe)
 
 	static const RemminaProtocolSetting autostart_settings[] =
 	{
-	{ REMMINA_PROTOCOL_SETTING_TYPE_CHECK, "enable-autostart", N_("Turn on autostart for this profile"),	       FALSE,  NULL, NULL },
+	{ REMMINA_PROTOCOL_SETTING_TYPE_CHECK, "enable-autostart", N_("Turn on \"Autostart\" for this profile"),	       FALSE,  NULL, NULL },
 	{ REMMINA_PROTOCOL_SETTING_TYPE_END, NULL, NULL, FALSE, NULL, NULL }
 	};
 
@@ -1177,7 +1177,7 @@ static void remmina_file_editor_update(RemminaFileEditor *gfe)
 
 	if (priv->resolution_auto_radio) {
 		if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(priv->resolution_auto_radio))) {
-			/* Resolution is set to auto (which means: use client fullscreen resolution, aka use client resolution) */
+			/* Resolution is set to auto (which means: Use client fullscreen resolution, aka use client resolution) */
 			res_w = res_h = 0;
 			res_mode = RES_USE_CLIENT;
 		} else if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(priv->resolution_iws_radio))) {
@@ -1255,7 +1255,7 @@ static void remmina_file_editor_on_connect(GtkWidget *button, RemminaFileEditor
 	remmina_file_editor_update(gfe);
 
 	gf = remmina_file_dup(gfe->priv->remmina_file);
-	/* Put server into name for Quick Connect */
+	/* Put server into name for "Quick Connect" */
 	if (remmina_file_get_filename(gf) == NULL)
 		remmina_file_set_string(gf, "name", remmina_file_get_string(gf, "server"));
 	gtk_widget_destroy(GTK_WIDGET(gfe));
@@ -1266,7 +1266,7 @@ static void remmina_file_editor_on_connect(GtkWidget *button, RemminaFileEditor
 static void remmina_file_editor_on_save_connect(GtkWidget *button, RemminaFileEditor *gfe)
 {
 	TRACE_CALL(__func__);
-	/** @todo Call remmina_file_editor_on_save */
+	/** @TODO: Call remmina_file_editor_on_save */
 	RemminaFile *gf;
 
 	remmina_file_editor_update(gfe);
@@ -1372,7 +1372,7 @@ static void remmina_file_editor_entry_on_changed(GtkEditable *editable, RemminaF
 	priv = gfe->priv;
 	if (remmina_file_get_filename(priv->remmina_file) == NULL) {
 		remmina_file_generate_filename(priv->remmina_file);
-		/* TODO Probably to be removed */
+		/* TODO: Probably to be removed */
 		remmina_file_editor_check_profile(gfe);
 	} else {
 		remmina_file_delete(remmina_file_get_filename(priv->remmina_file));
@@ -1414,7 +1414,7 @@ GtkWidget *remmina_file_editor_new_from_file(RemminaFile *remminafile)
 	if (remmina_file_get_filename(remminafile) == NULL)
 		gtk_dialog_set_response_sensitive(GTK_DIALOG(gfe), GTK_RESPONSE_APPLY, FALSE);
 
-	/* Create the Profile group on the top (for name and protocol) */
+	/* Create the "Profile" group on the top (for name and protocol) */
 	grid = gtk_grid_new();
 	gtk_widget_show(grid);
 	gtk_grid_set_row_spacing(GTK_GRID(grid), 4);
@@ -1482,8 +1482,8 @@ GtkWidget *remmina_file_editor_new_from_file(RemminaFile *remminafile)
 	remmina_plugin_manager_for_each_plugin(REMMINA_PLUGIN_TYPE_PROTOCOL, remmina_file_editor_iterate_protocol, gfe);
 	g_signal_connect(G_OBJECT(widget), "changed", G_CALLBACK(remmina_file_editor_protocol_combo_on_changed), gfe);
 
-	/* Prior Connection Command */
-	widget = gtk_label_new(_("Pre Command"));
+	/* Prior connection command */
+	widget = gtk_label_new(_("Pre-command"));
 	gtk_widget_show(widget);
 	gtk_widget_set_valign(widget, GTK_ALIGN_START);
 	gtk_widget_set_halign(widget, GTK_ALIGN_START);
@@ -1500,8 +1500,8 @@ GtkWidget *remmina_file_editor_new_from_file(RemminaFile *remminafile)
 	gtk_entry_set_placeholder_text(GTK_ENTRY(widget), "command %h %u %t %U %p %g --option");
 	gtk_widget_set_tooltip_markup(widget, _(cmd_tips));
 
-	/* POST Connection Command */
-	widget = gtk_label_new(_("Post Command"));
+	/* POST connection command */
+	widget = gtk_label_new(_("Post-command"));
 	gtk_widget_show(widget);
 	gtk_widget_set_valign(widget, GTK_ALIGN_START);
 	gtk_widget_set_halign(widget, GTK_ALIGN_START);
@@ -1518,7 +1518,7 @@ GtkWidget *remmina_file_editor_new_from_file(RemminaFile *remminafile)
 	gtk_entry_set_placeholder_text(GTK_ENTRY(widget), "/path/to/command -opt1 arg %h %u %t -opt2 %U %p %g");
 	gtk_widget_set_tooltip_markup(widget, _(cmd_tips));
 
-	/* Create the Preference frame */
+	/* Create the "Preference" frame */
 	widget = gtk_event_box_new();
 	gtk_widget_show(widget);
 	gtk_box_pack_start(GTK_BOX(gtk_dialog_get_content_area(GTK_DIALOG(gfe))), widget, TRUE, TRUE, 2);
@@ -1566,7 +1566,7 @@ GtkWidget *remmina_file_editor_new_copy(const gchar *filename)
 		return remmina_file_editor_new_from_file(remminafile);
 	} else {
 		dialog = gtk_message_dialog_new(NULL, GTK_DIALOG_MODAL, GTK_MESSAGE_ERROR, GTK_BUTTONS_CLOSE,
-						_("File %s not found."), filename);
+						_("Could not find the file \"%s\"."), filename);
 		gtk_dialog_run(GTK_DIALOG(dialog));
 		gtk_widget_destroy(dialog);
 		return NULL;
@@ -1584,7 +1584,7 @@ GtkWidget *remmina_file_editor_new_from_filename(const gchar *filename)
 		return remmina_file_editor_new_from_file(remminafile);
 	} else {
 		dialog = gtk_message_dialog_new(NULL, GTK_DIALOG_MODAL, GTK_MESSAGE_ERROR, GTK_BUTTONS_CLOSE,
-						_("File %s not found."), filename);
+						_("Could not find the file \"%s\"."), filename);
 		gtk_dialog_run(GTK_DIALOG(dialog));
 		gtk_widget_destroy(dialog);
 		return NULL;
diff --git a/src/remmina_sftp_plugin.c b/src/remmina_sftp_plugin.c
index 07698ebb9..49f487646 100644
--- a/src/remmina_sftp_plugin.c
+++ b/src/remmina_sftp_plugin.c
@@ -242,7 +242,7 @@ remmina_plugin_sftp_open_connection(RemminaProtocolWidget *gp)
 
 	if (pthread_create(&gpdata->thread, NULL, remmina_plugin_sftp_main_thread, gp)) {
 		remmina_plugin_service->protocol_plugin_set_error(gp,
-								  "Failed to initialize pthread. Falling back to non-thread mode…");
+								  "Could not initialize pthread. Falling back to non-thread mode…");
 		gpdata->thread = 0;
 		return FALSE;
 	} else {
@@ -347,10 +347,10 @@ static const RemminaProtocolSetting remmina_sftp_basic_settings[] =
 {
 	{ REMMINA_PROTOCOL_SETTING_TYPE_SERVER,	  "ssh_server",	    NULL,			  FALSE, "_sftp-ssh._tcp", NULL },
 	{ REMMINA_PROTOCOL_SETTING_TYPE_TEXT,	  "ssh_username",   N_("Username"),		  FALSE, NULL,		   NULL },
-	{ REMMINA_PROTOCOL_SETTING_TYPE_PASSWORD, "ssh_password",   N_("User password"),	  FALSE, NULL,		   NULL },
+	{ REMMINA_PROTOCOL_SETTING_TYPE_PASSWORD, "ssh_password",   N_("Password"),	  FALSE, NULL,		   NULL },
 	{ REMMINA_PROTOCOL_SETTING_TYPE_SELECT,	  "ssh_auth",	    N_("Authentication type"),	  FALSE, ssh_auth,	   NULL },
 	{ REMMINA_PROTOCOL_SETTING_TYPE_FILE,	  "ssh_privatekey", N_("Identity file"),	  FALSE, NULL,		   NULL },
-	{ REMMINA_PROTOCOL_SETTING_TYPE_PASSWORD, "ssh_passphrase", N_("Private key passphrase"), FALSE, NULL,		   NULL },
+	{ REMMINA_PROTOCOL_SETTING_TYPE_PASSWORD, "ssh_passphrase", N_("Password to unlock private key"), FALSE, NULL,		   NULL },
 	{ REMMINA_PROTOCOL_SETTING_TYPE_END,	  NULL,		    NULL,			  FALSE, NULL,		   NULL }
 };
 
@@ -374,7 +374,7 @@ static RemminaProtocolPlugin remmina_plugin_sftp =
 	remmina_plugin_sftp_query_feature,              // Query for available features
 	remmina_plugin_sftp_call_feature,               // Call a feature
 	NULL,                                           // Send a keystroke
-	NULL                                            // No screenshot support available
+	NULL                                            // Screenshot support unavailable
 };
 
 void
diff --git a/src/remmina_ssh_plugin.c b/src/remmina_ssh_plugin.c
index cb4b85d0c..a560e24a5 100644
--- a/src/remmina_ssh_plugin.c
+++ b/src/remmina_ssh_plugin.c
@@ -211,7 +211,7 @@ remmina_plugin_ssh_on_size_allocate(GtkWidget *widget, GtkAllocation *alloc, Rem
 
 
 /**
- * Remmina Protocol plugin main function.
+ * Remmina protocol plugin main function.
  *
  * First it starts the SSH tunnel if needed and then the SSH connection.
  *
@@ -285,7 +285,7 @@ remmina_plugin_ssh_main_thread(gpointer data)
 
 	ssh = g_object_get_data(G_OBJECT(gp), "user-data");
 	if (ssh) {
-		/* Create SSH Shell connection based on existing SSH session */
+		/* Create SSH shell connection based on existing SSH session */
 		shell = remmina_ssh_shell_new_from_ssh(ssh);
 		if (remmina_ssh_init_session(REMMINA_SSH(shell)) &&
 		    remmina_ssh_auth(REMMINA_SSH(shell), NULL, gp, remminafile) > 0 &&
@@ -339,7 +339,7 @@ remmina_plugin_ssh_main_thread(gpointer data)
 	gchar *charset = REMMINA_SSH(shell)->charset;
 	remmina_plugin_ssh_vte_terminal_set_encoding_and_pty(VTE_TERMINAL(gpdata->vte), charset, shell->master, shell->slave);
 
-	/* ToDo: the following call should be moved on the main thread, or something weird could happen */
+	/* TODO: The following call should be moved on the main thread, or something weird could happen */
 	remmina_plugin_ssh_on_size_allocate(GTK_WIDGET(gpdata->vte), NULL, gp);
 
 	remmina_plugin_service->protocol_plugin_signal_connection_opened(gp);
@@ -1058,7 +1058,7 @@ static const RemminaProtocolSetting remmina_ssh_basic_settings[] =
 	{ REMMINA_PROTOCOL_SETTING_TYPE_PASSWORD, "ssh_password",   N_("User password"),	  FALSE, NULL,	      NULL },
 	{ REMMINA_PROTOCOL_SETTING_TYPE_SELECT,	  "ssh_auth",	    N_("Authentication type"),	  FALSE, ssh_auth,    NULL },
 	{ REMMINA_PROTOCOL_SETTING_TYPE_FILE,	  "ssh_privatekey", N_("Identity file"),	  FALSE, NULL,	      NULL },
-	{ REMMINA_PROTOCOL_SETTING_TYPE_PASSWORD, "ssh_passphrase", N_("Private key passphrase"), FALSE, NULL,	      NULL },
+	{ REMMINA_PROTOCOL_SETTING_TYPE_PASSWORD, "ssh_passphrase", N_("Password to unlock private key"), FALSE, NULL,	      NULL },
 	{ REMMINA_PROTOCOL_SETTING_TYPE_TEXT,	  "exec",	    N_("Startup program"),	  FALSE, NULL,	      NULL },
 	{ REMMINA_PROTOCOL_SETTING_TYPE_END,	  NULL,		    NULL,			  FALSE, NULL,	      NULL }
 };
@@ -1082,12 +1082,12 @@ static const RemminaProtocolSetting remmina_ssh_advanced_settings[] =
 	{ REMMINA_PROTOCOL_SETTING_TYPE_TEXT,	"ssh_kex_algorithms",	  N_("KEX (Key Exchange) algorithms"),	    FALSE, NULL,		 NULL },
 	{ REMMINA_PROTOCOL_SETTING_TYPE_TEXT,	"ssh_ciphers",		  N_("Symmetric cipher client to server"),  FALSE, NULL,		 NULL },
 	{ REMMINA_PROTOCOL_SETTING_TYPE_TEXT,	"ssh_hostkeytypes",	  N_("Preferred server host key types"),    FALSE, NULL,		 NULL },
-	{ REMMINA_PROTOCOL_SETTING_TYPE_FOLDER, "sshlogfolder",		  N_("SSH session log folder"),		    FALSE, NULL,		 NULL },
-	{ REMMINA_PROTOCOL_SETTING_TYPE_TEXT,	"sshlogname",		  N_("SSH session log file name"),	    FALSE, NULL,		 NULL },
-	{ REMMINA_PROTOCOL_SETTING_TYPE_CHECK,	"sshlogenabled",	  N_("Enable SSH session logging at exit"), FALSE, NULL,		 NULL },
-	{ REMMINA_PROTOCOL_SETTING_TYPE_CHECK,	"audiblebell",		  N_("Enable terminal audible bell"),	    FALSE, NULL,		 NULL },
-	{ REMMINA_PROTOCOL_SETTING_TYPE_CHECK,	"ssh_compression",	  N_("Enable SSH compression"),		    FALSE, NULL,		 NULL },
-	{ REMMINA_PROTOCOL_SETTING_TYPE_CHECK,	"disablepasswordstoring", N_("Disable password storing"),	    TRUE,  NULL,		 NULL },
+	{ REMMINA_PROTOCOL_SETTING_TYPE_FOLDER, "sshlogfolder",		  N_("Folder for SSH session log"),		    FALSE, NULL,		 NULL },
+	{ REMMINA_PROTOCOL_SETTING_TYPE_TEXT,	"sshlogname",		  N_("Filename for SSH session log"),	    FALSE, NULL,		 NULL },
+	{ REMMINA_PROTOCOL_SETTING_TYPE_CHECK,	"sshlogenabled",	  N_("Log SSH session when exiing Remmina"), FALSE, NULL,		 NULL },
+	{ REMMINA_PROTOCOL_SETTING_TYPE_CHECK,	"audiblebell",		  N_("Audible terminal bell"),	    FALSE, NULL,		 NULL },
+	{ REMMINA_PROTOCOL_SETTING_TYPE_CHECK,	"ssh_compression",	  N_("SSH compression"),		    FALSE, NULL,		 NULL },
+	{ REMMINA_PROTOCOL_SETTING_TYPE_CHECK,	"disablepasswordstoring", N_("Don't remember passwords"),	    TRUE,  NULL,		 NULL },
 	{ REMMINA_PROTOCOL_SETTING_TYPE_CHECK,	"ssh_stricthostkeycheck", N_("Strict host key checking"),	    TRUE,  NULL,		 NULL },
 	{ REMMINA_PROTOCOL_SETTING_TYPE_END,	NULL,			  NULL,					    FALSE, NULL,		 NULL }
 };
@@ -1153,7 +1153,7 @@ remmina_ssh_plugin_load_terminal_palettes(gpointer *ssh_terminal_palette_new)
 		gchar *remmina_dir = g_build_path("/", dirs[i], "remmina", "theme", NULL);
 		system_data_dir = g_dir_open(remmina_dir, 0, &error);
 		g_free(remmina_dir);
-		// ignoring this error is ok, because the folder may not existing
+		// ignoring this error is OK, because the folder may not exist
 		if (error) {
 			g_error_free(error);
 			error = NULL;