From: Jacob Nevins <jacobn@chiark.greenend.org.uk>
Date: Mon, 5 Jan 2015 23:49:25 +0000 (+0000)
Subject: Merge branch 'pre-0.64'
X-Git-Tag: 0.68~636
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=5904545cc18289541702da284b00490cb25a753e;hp=-c;p=PuTTY.git

Merge branch 'pre-0.64'
---

5904545cc18289541702da284b00490cb25a753e
diff --combined LICENCE
index 2d3a374d,eab8817e..3e15aeb9
--- a/LICENCE
+++ b/LICENCE
@@@ -1,9 -1,9 +1,9 @@@
- PuTTY is copyright 1997-2014 Simon Tatham.
+ PuTTY is copyright 1997-2015 Simon Tatham.
  
  Portions copyright Robert de Bath, Joris van Rantwijk, Delian
  Delchev, Andreas Schultz, Jeroen Massar, Wez Furlong, Nicolas Barry,
  Justin Bradford, Ben Harris, Malcolm Smith, Ahmad Khalifa, Markus
 -Kuhn, Colin Watson, and CORE SDI S.A.
 +Kuhn, Colin Watson, Christopher Staite, and CORE SDI S.A.
  
  Permission is hereby granted, free of charge, to any person
  obtaining a copy of this software and associated documentation files
diff --combined doc/licence.but
index 68cba420,0856d863..333a9192
--- a/doc/licence.but
+++ b/doc/licence.but
@@@ -1,11 -1,11 +1,11 @@@
  \A{licence} PuTTY \ii{Licence}
  
- PuTTY is \i{copyright} 1997-2014 Simon Tatham.
+ PuTTY is \i{copyright} 1997-2015 Simon Tatham.
  
  Portions copyright Robert de Bath, Joris van Rantwijk, Delian
  Delchev, Andreas Schultz, Jeroen Massar, Wez Furlong, Nicolas Barry,
  Justin Bradford, Ben Harris, Malcolm Smith, Ahmad Khalifa, Markus
 -Kuhn, Colin Watson, and CORE SDI S.A.
 +Kuhn, Colin Watson, Christopher Staite, and CORE SDI S.A.
  
  Permission is hereby granted, free of charge, to any person
  obtaining a copy of this software and associated documentation files
diff --combined unix/gtkdlg.c
index ffdf3236,2b8fec17..9fd28ce7
--- a/unix/gtkdlg.c
+++ b/unix/gtkdlg.c
@@@ -3439,12 -3439,12 +3439,12 @@@ static void licence_clicked(GtkButton *
      char *title;
  
      char *licence =
- 	"Copyright 1997-2014 Simon Tatham.\n\n"
+ 	"Copyright 1997-2015 Simon Tatham.\n\n"
  
  	"Portions copyright Robert de Bath, Joris van Rantwijk, Delian "
  	"Delchev, Andreas Schultz, Jeroen Massar, Wez Furlong, Nicolas "
  	"Barry, Justin Bradford, Ben Harris, Malcolm Smith, Ahmad Khalifa, "
 -	"Markus Kuhn, Colin Watson, and CORE SDI S.A.\n\n"
 +	"Markus Kuhn, Colin Watson, Christopher Staite, and CORE SDI S.A.\n\n"
  
  	"Permission is hereby granted, free of charge, to any person "
  	"obtaining a copy of this software and associated documentation "
@@@ -3520,7 -3520,7 +3520,7 @@@ void about_box(void *window
  		       w, FALSE, FALSE, 5);
      gtk_widget_show(w);
  
-     w = gtk_label_new("Copyright 1997-2014 Simon Tatham. All rights reserved");
+     w = gtk_label_new("Copyright 1997-2015 Simon Tatham. All rights reserved");
      gtk_box_pack_start(GTK_BOX(GTK_DIALOG(aboutbox)->vbox),
  		       w, FALSE, FALSE, 5);
      gtk_widget_show(w);
diff --combined unix/uxplink.c
index d4230935,3bcec398..4f991ba8
--- a/unix/uxplink.c
+++ b/unix/uxplink.c
@@@ -113,7 -113,7 +113,7 @@@ static void *backhandle
  static Conf *conf;
  
  /*
-  * Default settings that are specific to pterm.
+  * Default settings that are specific to Unix plink.
   */
  char *platform_default_s(const char *name)
  {
@@@ -152,7 -152,7 +152,7 @@@ int term_ldisc(Terminal *term, int mode
  {
      return FALSE;
  }
 -void ldisc_update(void *frontend, int echo, int edit)
 +void frontend_echoedit_update(void *frontend, int echo, int edit)
  {
      /* Update stdin read mode to reflect changes in line discipline. */
      struct termios mode;
@@@ -178,9 -178,8 +178,9 @@@
  	mode.c_cc[VMIN] = 1;
  	mode.c_cc[VTIME] = 0;
  	/* FIXME: perhaps what we do with IXON/IXOFF should be an
 -	 * argument to ldisc_update(), to allow implementation of SSH-2
 -	 * "xon-xoff" and Rlogin's equivalent? */
 +	 * argument to frontend_echoedit_update(), to allow
 +	 * implementation of SSH-2 "xon-xoff" and Rlogin's
 +	 * equivalent? */
  	mode.c_iflag &= ~IXON;
  	mode.c_iflag &= ~IXOFF;
      }
@@@ -982,7 -981,7 +982,7 @@@ int main(int argc, char **argv
       */
      local_tty = (tcgetattr(STDIN_FILENO, &orig_termios) == 0);
      atexit(cleanup_termios);
 -    ldisc_update(NULL, 1, 1);
 +    frontend_echoedit_update(NULL, 1, 1);
      sending = FALSE;
      now = GETTICKCOUNT();
  
diff --combined windows/pageant.rc
index d354a9c7,20ec509b..dee8a12e
--- a/windows/pageant.rc
+++ b/windows/pageant.rc
@@@ -45,47 -45,46 +45,47 @@@ BEGI
      PUSHBUTTON "View &Licence", 101, 6, 52, 70, 14
      CTEXT "Pageant", 102, 10, 6, 120, 8
      CTEXT "", 100, 10, 16, 120, 16
-     CTEXT "\251 1997-2014 Simon Tatham. All rights reserved.",
+     CTEXT "\251 1997-2015 Simon Tatham. All rights reserved.",
            103, 10, 34, 120, 16
  END
  
  /* No accelerators used */
 -214 DIALOG DISCARDABLE 50, 50, 226, 263
 +214 DIALOG DISCARDABLE 50, 50, 226, 271
  STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
  CAPTION "PuTTY Licence"
  FONT 8, "MS Shell Dlg"
  BEGIN
 -    DEFPUSHBUTTON "OK", IDOK, 98, 243, 44, 14
 +    DEFPUSHBUTTON "OK", IDOK, 98, 251, 44, 14
  
-     LTEXT "Copyright \251 1997-2014 Simon Tatham", 1000, 10, 10, 206, 8
+     LTEXT "Copyright \251 1997-2015 Simon Tatham", 1000, 10, 10, 206, 8
  
      LTEXT "Portions copyright Robert de Bath, Joris van Rantwijk, Delian", 1001, 10, 26, 206, 8
      LTEXT "Delchev, Andreas Schultz, Jeroen Massar, Wez Furlong, Nicolas", 1002, 10, 34, 206, 8
      LTEXT "Barry, Justin Bradford, Ben Harris, Malcolm Smith, Ahmad Khalifa,", 1003, 10, 42, 206, 8
 -    LTEXT "Markus Kuhn, Colin Watson, and CORE SDI S.A.", 1004, 10, 50, 206, 8
 +    LTEXT "Markus Kuhn, Colin Watson, Christopher Staite, and CORE SDI", 1004, 10, 50, 206, 8
 +    LTEXT "S.A.", 1005, 10, 58, 206, 8
  
 -    LTEXT "Permission is hereby granted, free of charge, to any person", 1005, 10, 66, 206, 8
 -    LTEXT "obtaining a copy of this software and associated documentation", 1006, 10, 74, 206, 8
 -    LTEXT "files (the ""Software""), to deal in the Software without restriction,", 1007, 10, 82, 206, 8
 -    LTEXT "including without limitation the rights to use, copy, modify, merge,", 1008, 10, 90, 206, 8
 -    LTEXT "publish, distribute, sublicense, and/or sell copies of the Software,", 1009, 10, 98, 206, 8
 -    LTEXT "and to permit persons to whom the Software is furnished to do so,", 1010, 10, 106, 206, 8
 -    LTEXT "subject to the following conditions:", 1011, 10, 114, 206, 8
 +    LTEXT "Permission is hereby granted, free of charge, to any person", 1006, 10, 74, 206, 8
 +    LTEXT "obtaining a copy of this software and associated documentation", 1007, 10, 82, 206, 8
 +    LTEXT "files (the ""Software""), to deal in the Software without restriction,", 1008, 10, 90, 206, 8
 +    LTEXT "including without limitation the rights to use, copy, modify, merge,", 1009, 10, 98, 206, 8
 +    LTEXT "publish, distribute, sublicense, and/or sell copies of the Software,", 1010, 10, 106, 206, 8
 +    LTEXT "and to permit persons to whom the Software is furnished to do so,", 1011, 10, 114, 206, 8
 +    LTEXT "subject to the following conditions:", 1012, 10, 122, 206, 8
  
 -    LTEXT "The above copyright notice and this permission notice shall be", 1012, 10, 130, 206, 8
 -    LTEXT "included in all copies or substantial portions of the Software.", 1013, 10, 138, 206, 8
 +    LTEXT "The above copyright notice and this permission notice shall be", 1013, 10, 138, 206, 8
 +    LTEXT "included in all copies or substantial portions of the Software.", 1014, 10, 146, 206, 8
  
 -    LTEXT "THE SOFTWARE IS PROVIDED ""AS IS"", WITHOUT", 1014, 10, 154, 206, 8
 -    LTEXT "WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,", 1015, 10, 162, 206, 8
 -    LTEXT "INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF", 1016, 10, 170, 206, 8
 -    LTEXT "MERCHANTABILITY, FITNESS FOR A PARTICULAR", 1017, 10, 178, 206, 8
 -    LTEXT "PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE", 1018, 10, 186, 206, 8
 -    LTEXT "COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES", 1019, 10, 194, 206, 8
 -    LTEXT "OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,", 1020, 10, 202, 206, 8
 -    LTEXT "TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN", 1021, 10, 210, 206, 8
 -    LTEXT "CONNECTION WITH THE SOFTWARE OR THE USE OR", 1022, 10, 218, 206, 8
 -    LTEXT "OTHER DEALINGS IN THE SOFTWARE.", 1023, 10, 226, 206, 8
 +    LTEXT "THE SOFTWARE IS PROVIDED ""AS IS"", WITHOUT", 1015, 10, 162, 206, 8
 +    LTEXT "WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,", 1016, 10, 170, 206, 8
 +    LTEXT "INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF", 1017, 10, 178, 206, 8
 +    LTEXT "MERCHANTABILITY, FITNESS FOR A PARTICULAR", 1018, 10, 186, 206, 8
 +    LTEXT "PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE", 1019, 10, 194, 206, 8
 +    LTEXT "COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES", 1020, 10, 202, 206, 8
 +    LTEXT "OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,", 1021, 10, 210, 206, 8
 +    LTEXT "TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN", 1022, 10, 218, 206, 8
 +    LTEXT "CONNECTION WITH THE SOFTWARE OR THE USE OR", 1023, 10, 226, 206, 8
 +    LTEXT "OTHER DEALINGS IN THE SOFTWARE.", 1024, 10, 234, 206, 8
  
  END
  
diff --combined windows/puttygen.rc
index 63c0bcc0,9547e754..8982674a
--- a/windows/puttygen.rc
+++ b/windows/puttygen.rc
@@@ -38,47 -38,46 +38,47 @@@ BEGI
      PUSHBUTTON "View &Licence", 101, 6, 52, 70, 14
      CTEXT "PuTTYgen", 102, 10, 6, 120, 8
      CTEXT "", 100, 10, 16, 120, 16
-     CTEXT "\251 1997-2014 Simon Tatham. All rights reserved.",
+     CTEXT "\251 1997-2015 Simon Tatham. All rights reserved.",
            103, 10, 34, 120, 16
  END
  
  /* No accelerators used */
 -214 DIALOG DISCARDABLE 50, 50, 226, 263
 +214 DIALOG DISCARDABLE 50, 50, 226, 271
  STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
  CAPTION "PuTTY Licence"
  FONT 8, "MS Shell Dlg"
  BEGIN
 -    DEFPUSHBUTTON "OK", IDOK, 98, 243, 44, 14
 +    DEFPUSHBUTTON "OK", IDOK, 98, 251, 44, 14
  
-     LTEXT "Copyright \251 1997-2014 Simon Tatham", 1000, 10, 10, 206, 8
+     LTEXT "Copyright \251 1997-2015 Simon Tatham", 1000, 10, 10, 206, 8
  
      LTEXT "Portions copyright Robert de Bath, Joris van Rantwijk, Delian", 1001, 10, 26, 206, 8
      LTEXT "Delchev, Andreas Schultz, Jeroen Massar, Wez Furlong, Nicolas", 1002, 10, 34, 206, 8
      LTEXT "Barry, Justin Bradford, Ben Harris, Malcolm Smith, Ahmad Khalifa,", 1003, 10, 42, 206, 8
 -    LTEXT "Markus Kuhn, Colin Watson, and CORE SDI S.A.", 1004, 10, 50, 206, 8
 +    LTEXT "Markus Kuhn, Colin Watson, Christopher Staite, and CORE SDI", 1004, 10, 50, 206, 8
 +    LTEXT "S.A.", 1005, 10, 58, 206, 8
  
 -    LTEXT "Permission is hereby granted, free of charge, to any person", 1005, 10, 66, 206, 8
 -    LTEXT "obtaining a copy of this software and associated documentation", 1006, 10, 74, 206, 8
 -    LTEXT "files (the ""Software""), to deal in the Software without restriction,", 1007, 10, 82, 206, 8
 -    LTEXT "including without limitation the rights to use, copy, modify, merge,", 1008, 10, 90, 206, 8
 -    LTEXT "publish, distribute, sublicense, and/or sell copies of the Software,", 1009, 10, 98, 206, 8
 -    LTEXT "and to permit persons to whom the Software is furnished to do so,", 1010, 10, 106, 206, 8
 -    LTEXT "subject to the following conditions:", 1011, 10, 114, 206, 8
 +    LTEXT "Permission is hereby granted, free of charge, to any person", 1006, 10, 74, 206, 8
 +    LTEXT "obtaining a copy of this software and associated documentation", 1007, 10, 82, 206, 8
 +    LTEXT "files (the ""Software""), to deal in the Software without restriction,", 1008, 10, 90, 206, 8
 +    LTEXT "including without limitation the rights to use, copy, modify, merge,", 1009, 10, 98, 206, 8
 +    LTEXT "publish, distribute, sublicense, and/or sell copies of the Software,", 1010, 10, 106, 206, 8
 +    LTEXT "and to permit persons to whom the Software is furnished to do so,", 1011, 10, 114, 206, 8
 +    LTEXT "subject to the following conditions:", 1012, 10, 122, 206, 8
  
 -    LTEXT "The above copyright notice and this permission notice shall be", 1012, 10, 130, 206, 8
 -    LTEXT "included in all copies or substantial portions of the Software.", 1013, 10, 138, 206, 8
 +    LTEXT "The above copyright notice and this permission notice shall be", 1013, 10, 138, 206, 8
 +    LTEXT "included in all copies or substantial portions of the Software.", 1014, 10, 146, 206, 8
  
 -    LTEXT "THE SOFTWARE IS PROVIDED ""AS IS"", WITHOUT", 1014, 10, 154, 206, 8
 -    LTEXT "WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,", 1015, 10, 162, 206, 8
 -    LTEXT "INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF", 1016, 10, 170, 206, 8
 -    LTEXT "MERCHANTABILITY, FITNESS FOR A PARTICULAR", 1017, 10, 178, 206, 8
 -    LTEXT "PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE", 1018, 10, 186, 206, 8
 -    LTEXT "COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES", 1019, 10, 194, 206, 8
 -    LTEXT "OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,", 1020, 10, 202, 206, 8
 -    LTEXT "TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN", 1021, 10, 210, 206, 8
 -    LTEXT "CONNECTION WITH THE SOFTWARE OR THE USE OR", 1022, 10, 218, 206, 8
 -    LTEXT "OTHER DEALINGS IN THE SOFTWARE.", 1023, 10, 226, 206, 8
 +    LTEXT "THE SOFTWARE IS PROVIDED ""AS IS"", WITHOUT", 1015, 10, 162, 206, 8
 +    LTEXT "WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,", 1016, 10, 170, 206, 8
 +    LTEXT "INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF", 1017, 10, 178, 206, 8
 +    LTEXT "MERCHANTABILITY, FITNESS FOR A PARTICULAR", 1018, 10, 186, 206, 8
 +    LTEXT "PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE", 1019, 10, 194, 206, 8
 +    LTEXT "COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES", 1020, 10, 202, 206, 8
 +    LTEXT "OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,", 1021, 10, 210, 206, 8
 +    LTEXT "TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN", 1022, 10, 218, 206, 8
 +    LTEXT "CONNECTION WITH THE SOFTWARE OR THE USE OR", 1023, 10, 226, 206, 8
 +    LTEXT "OTHER DEALINGS IN THE SOFTWARE.", 1024, 10, 234, 206, 8
  
  END
  
diff --combined windows/win_res.rc2
index d0273350,b7dfd945..744780ba
--- a/windows/win_res.rc2
+++ b/windows/win_res.rc2
@@@ -26,7 -26,7 +26,7 @@@ BEGI
      PUSHBUTTON "Visit &Web Site", IDA_WEB, 84, 52, 70, 14
      CTEXT "PuTTY", IDA_TEXT1, 10, 6, 194, 8
      CTEXT "", IDA_VERSION, 10, 16, 194, 16
-     CTEXT "\251 1997-2014 Simon Tatham. All rights reserved.",
+     CTEXT "\251 1997-2015 Simon Tatham. All rights reserved.",
            IDA_TEXT2, 10, 34, 194, 16
  END
  
@@@ -51,42 -51,41 +51,42 @@@ BEGI
  END
  
  /* No accelerators used */
 -IDD_LICENCEBOX DIALOG DISCARDABLE 50, 50, 226, 263
 +IDD_LICENCEBOX DIALOG DISCARDABLE 50, 50, 226, 271
  STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
  CAPTION "PuTTY Licence"
  FONT 8, "MS Shell Dlg"
  BEGIN
 -    DEFPUSHBUTTON "OK", IDOK, 98, 243, 44, 14
 +    DEFPUSHBUTTON "OK", IDOK, 98, 251, 44, 14
  
-     LTEXT "Copyright \251 1997-2014 Simon Tatham", 1000, 10, 10, 206, 8
+     LTEXT "Copyright \251 1997-2015 Simon Tatham", 1000, 10, 10, 206, 8
  
      LTEXT "Portions copyright Robert de Bath, Joris van Rantwijk, Delian", 1001, 10, 26, 206, 8
      LTEXT "Delchev, Andreas Schultz, Jeroen Massar, Wez Furlong, Nicolas", 1002, 10, 34, 206, 8
      LTEXT "Barry, Justin Bradford, Ben Harris, Malcolm Smith, Ahmad Khalifa,", 1003, 10, 42, 206, 8
 -    LTEXT "Markus Kuhn, Colin Watson, and CORE SDI S.A.", 1004, 10, 50, 206, 8
 +    LTEXT "Markus Kuhn, Colin Watson, Christopher Staite, and CORE SDI", 1004, 10, 50, 206, 8
 +    LTEXT "S.A.", 1005, 10, 58, 206, 8
  
 -    LTEXT "Permission is hereby granted, free of charge, to any person", 1005, 10, 66, 206, 8
 -    LTEXT "obtaining a copy of this software and associated documentation", 1006, 10, 74, 206, 8
 -    LTEXT "files (the ""Software""), to deal in the Software without restriction,", 1007, 10, 82, 206, 8
 -    LTEXT "including without limitation the rights to use, copy, modify, merge,", 1008, 10, 90, 206, 8
 -    LTEXT "publish, distribute, sublicense, and/or sell copies of the Software,", 1009, 10, 98, 206, 8
 -    LTEXT "and to permit persons to whom the Software is furnished to do so,", 1010, 10, 106, 206, 8
 -    LTEXT "subject to the following conditions:", 1011, 10, 114, 206, 8
 +    LTEXT "Permission is hereby granted, free of charge, to any person", 1006, 10, 74, 206, 8
 +    LTEXT "obtaining a copy of this software and associated documentation", 1007, 10, 82, 206, 8
 +    LTEXT "files (the ""Software""), to deal in the Software without restriction,", 1008, 10, 90, 206, 8
 +    LTEXT "including without limitation the rights to use, copy, modify, merge,", 1009, 10, 98, 206, 8
 +    LTEXT "publish, distribute, sublicense, and/or sell copies of the Software,", 1010, 10, 106, 206, 8
 +    LTEXT "and to permit persons to whom the Software is furnished to do so,", 1011, 10, 114, 206, 8
 +    LTEXT "subject to the following conditions:", 1012, 10, 122, 206, 8
  
 -    LTEXT "The above copyright notice and this permission notice shall be", 1012, 10, 130, 206, 8
 -    LTEXT "included in all copies or substantial portions of the Software.", 1013, 10, 138, 206, 8
 +    LTEXT "The above copyright notice and this permission notice shall be", 1013, 10, 138, 206, 8
 +    LTEXT "included in all copies or substantial portions of the Software.", 1014, 10, 146, 206, 8
  
 -    LTEXT "THE SOFTWARE IS PROVIDED ""AS IS"", WITHOUT", 1014, 10, 154, 206, 8
 -    LTEXT "WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,", 1015, 10, 162, 206, 8
 -    LTEXT "INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF", 1016, 10, 170, 206, 8
 -    LTEXT "MERCHANTABILITY, FITNESS FOR A PARTICULAR", 1017, 10, 178, 206, 8
 -    LTEXT "PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE", 1018, 10, 186, 206, 8
 -    LTEXT "COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES", 1019, 10, 194, 206, 8
 -    LTEXT "OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,", 1020, 10, 202, 206, 8
 -    LTEXT "TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN", 1021, 10, 210, 206, 8
 -    LTEXT "CONNECTION WITH THE SOFTWARE OR THE USE OR", 1022, 10, 218, 206, 8
 -    LTEXT "OTHER DEALINGS IN THE SOFTWARE.", 1023, 10, 226, 206, 8
 +    LTEXT "THE SOFTWARE IS PROVIDED ""AS IS"", WITHOUT", 1015, 10, 162, 206, 8
 +    LTEXT "WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,", 1016, 10, 170, 206, 8
 +    LTEXT "INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF", 1017, 10, 178, 206, 8
 +    LTEXT "MERCHANTABILITY, FITNESS FOR A PARTICULAR", 1018, 10, 186, 206, 8
 +    LTEXT "PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE", 1019, 10, 194, 206, 8
 +    LTEXT "COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES", 1020, 10, 202, 206, 8
 +    LTEXT "OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,", 1021, 10, 210, 206, 8
 +    LTEXT "TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN", 1022, 10, 218, 206, 8
 +    LTEXT "CONNECTION WITH THE SOFTWARE OR THE USE OR", 1023, 10, 226, 206, 8
 +    LTEXT "OTHER DEALINGS IN THE SOFTWARE.", 1024, 10, 234, 206, 8
  
  END