X-Git-Url: https://git.distorted.org.uk/u/mdw/putty/blobdiff_plain/8cee3b72e807bc6cea6237e904c42f754a537311..6327f1c1bca63be31f8dff368adad4f29a5d4911:/windlg.c

diff --git a/windlg.c b/windlg.c
index 6d035ce2..bf981297 100644
--- a/windlg.c
+++ b/windlg.c
@@ -1176,7 +1176,7 @@ static void init_dlg_ctrls(HWND hwnd, int keepsess)
     CheckDlgButton(hwnd, IDC_BLINKTEXT, cfg.blinktext);
 
     SetDlgItemText(hwnd, IDC_WINEDIT, cfg.wintitle);
-    CheckDlgButton(hwnd, IDC_WINNAME, cfg.win_name_always);
+    CheckDlgButton(hwnd, IDC_WINNAME, !cfg.win_name_always);
     CheckDlgButton(hwnd, IDC_HIDEMOUSE, cfg.hide_mouseptr);
     CheckDlgButton(hwnd, IDC_SUNKENEDGE, cfg.sunken_edge);
     SetDlgItemInt(hwnd, IDC_WINBEDIT, cfg.window_border, FALSE);
@@ -1720,7 +1720,7 @@ static void create_controls(HWND hwnd, int dlgtype, int panel)
 		 IDC_BOX_APPEARANCE3);
 	multiedit(&cp,
 		  "Window &title:", IDC_WINTITLE, IDC_WINEDIT, 100, NULL);
-	checkbox(&cp, "Avoid ever using &icon title", IDC_WINNAME);
+	checkbox(&cp, "Separate window and &icon titles", IDC_WINNAME);
 	endbox(&cp);
 	beginbox(&cp, "Adjust the use of the mouse pointer",
 		 IDC_BOX_APPEARANCE4);
@@ -1965,7 +1965,7 @@ static void create_controls(HWND hwnd, int dlgtype, int panel)
     }
 
     if (panel == sshpanelstart) {
-	/* The SSH panel. Accelerators used: [acgoh] r pe12ni sd */
+	/* The SSH panel. Accelerators used: [acgoh] r pel12n sud i */
 	struct ctlpos cp;
 	ctlposinit(&cp, hwnd, 80, 3, 13);
 	if (dlgtype == 0) {
@@ -1986,10 +1986,11 @@ static void create_controls(HWND hwnd, int dlgtype, int panel)
 		      "2 o&nly", IDC_SSHPROT2ONLY, NULL);
 	    endbox(&cp);
 	    beginbox(&cp, "Encryption options", IDC_BOX_SSH3);
+	    /* Adds accelerators: ud */
 	    prefslist(&cipherlist, &cp, "Encryption cipher &selection policy:",
 		      IDC_CIPHERSTATIC2, IDC_CIPHERLIST, IDC_CIPHERUP,
 		      IDC_CIPHERDN);
-	    checkbox(&cp, "Enable non-standard use of single-&DES in SSH 2",
+	    checkbox(&cp, "Enable non-standard use of s&ingle-DES in SSH 2",
 		     IDC_SSH2DES);
 	    endbox(&cp);
 	}
@@ -2022,7 +2023,7 @@ static void create_controls(HWND hwnd, int dlgtype, int panel)
     }
 
     if (panel == sshbugspanelstart) {
-	/* The SSH bugs panel. Accelerators used: [acgoh] isrmep */
+	/* The SSH bugs panel. Accelerators used: [acgoh] isrmepd */
 	struct ctlpos cp;
 	ctlposinit(&cp, hwnd, 80, 3, 13);
 	if (dlgtype == 0) {
@@ -2049,7 +2050,7 @@ static void create_controls(HWND hwnd, int dlgtype, int panel)
     }
 
     if (panel == tunnelspanelstart) {
-	/* The Tunnels panel. Accelerators used: [acgoh] deilmrstxp */
+	/* The Tunnels panel. Accelerators used: [acgoh] exu tprsdilm */
 	struct ctlpos cp;
 	ctlposinit(&cp, hwnd, 80, 3, 13);
 	if (dlgtype == 0) {
@@ -2909,7 +2910,7 @@ static int GenericMainDlgProc(HWND hwnd, UINT msg,
 		if (HIWORD(wParam) == BN_CLICKED ||
 		    HIWORD(wParam) == BN_DOUBLECLICKED)
 			cfg.win_name_always =
-			IsDlgButtonChecked(hwnd, IDC_WINNAME);
+			!IsDlgButtonChecked(hwnd, IDC_WINNAME);
 		break;
 	      case IDC_HIDEMOUSE:
 		if (HIWORD(wParam) == BN_CLICKED ||