X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=blobdiff_plain;f=unix%2Fuxcfg.c;h=fff29680221b572f4c5b360b6ba22d24b52b1565;hb=693bbf0ec6007120b91dafb4eaed1ae833eb59f7;hp=813009ef563f1a5b8cf7e065d4ae23aa10685315;hpb=46f26ee483871434aa6f81c339e08224d23efcd3;p=PuTTY.git

diff --git a/unix/uxcfg.c b/unix/uxcfg.c
index 813009ef..fff29680 100644
--- a/unix/uxcfg.c
+++ b/unix/uxcfg.c
@@ -129,6 +129,21 @@ void unix_setup_config_box(struct controlbox *b, int midsession, void *win)
 		 HELPCTX(no_help), dlg_stdeditbox_handler,
                  I(offsetof(Config,shadowboldoffset)), I(-1));
 
+    /*
+     * Markus Kuhn feels, not totally unreasonably, that it's good
+     * for all applications to shift into UTF-8 mode if they notice
+     * that they've been started with a LANG setting dictating it,
+     * so that people don't have to keep remembering a separate
+     * UTF-8 option for every application they use. Therefore,
+     * here's an override option in the Translation panel.
+     */
+    s = ctrl_getset(b, "Window/Translation", "trans",
+		    "Character set translation on received data");
+    ctrl_checkbox(s, "Override with UTF-8 if locale says so", 'l',
+		  HELPCTX(translation_utf8_override),
+		  dlg_stdcheckbox_handler,
+		  I(offsetof(Config,utf8_override)));
+
     /*
      * Unix supports a local-command proxy. This also means we must
      * adjust the text on the `Telnet command' control.