1
0
mirror of https://git.tartarus.org/simon/putty.git synced 2025-01-25 01:02:24 +00:00

Fix the licence again. (Despite the copyright holders being more

numerous, it still only said _I_ would not be liable rather than
_everybody_ not being liable; also the resource file versions
weren't up to date.)

[originally from svn r1272]
This commit is contained in:
Simon Tatham 2001-09-18 18:40:00 +00:00
parent 2e4480d6b6
commit f3b95b60b4
4 changed files with 81 additions and 69 deletions

View File

@ -17,7 +17,7 @@ included in all copies or substantial portions of the Software.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
NONINFRINGEMENT. IN NO EVENT SHALL SIMON TATHAM BE LIABLE FOR ANY NONINFRINGEMENT. IN NO EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE
CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF
TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

View File

@ -45,35 +45,39 @@ BEGIN
END END
/* No accelerators used */ /* No accelerators used */
214 DIALOG DISCARDABLE 50, 50, 226, 223 214 DIALOG DISCARDABLE 50, 50, 226, 255
STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
CAPTION "Pageant Licence" CAPTION "PuTTY Licence"
FONT 8, "MS Sans Serif" FONT 8, "MS Sans Serif"
BEGIN BEGIN
DEFPUSHBUTTON "OK", IDOK, 98, 203, 44, 14 DEFPUSHBUTTON "OK", IDOK, 98, 235, 44, 14
LTEXT "Copyright \251 1997-2001 Simon Tatham", 1000, 10, 10, 206, 8 LTEXT "Copyright \251 1997-2001 Simon Tatham", 1000, 10, 10, 206, 8
LTEXT "Permission is hereby granted, free of charge, to any person", 1002, 10, 26, 206, 8 LTEXT "Portions copyright Robert de Bath, Joris van Rantwijk, Delian", 1002, 10, 26, 206, 8
LTEXT "obtaining a copy of this software and associated documentation", 1003, 10, 34, 206, 8 LTEXT "Delchev, Andreas Schultz, Jeroen Massar, Wez Furlong, Nicolas", 1003, 10, 34, 206, 8
LTEXT "files (the ""Software""), to deal in the Software without restriction,", 1004, 10, 42, 206, 8 LTEXT "Barry.", 1003, 10, 42, 206, 8
LTEXT "including without limitation the rights to use, copy, modify, merge,", 1005, 10, 50, 206, 8
LTEXT "publish, distribute, sublicense, and/or sell copies of the Software,", 1006, 10, 58, 206, 8
LTEXT "and to permit persons to whom the Software is furnished to do so,", 1007, 10, 66, 206, 8
LTEXT "subject to the following conditions:", 1008, 10, 74, 206, 8
LTEXT "The above copyright notice and this permission notice shall be", 1010, 10, 90, 206, 8 LTEXT "Permission is hereby granted, free of charge, to any person", 1002, 10, 58, 206, 8
LTEXT "included in all copies or substantial portions of the Software.", 1011, 10, 98, 206, 8 LTEXT "obtaining a copy of this software and associated documentation", 1003, 10, 66, 206, 8
LTEXT "files (the ""Software""), to deal in the Software without restriction,", 1004, 10, 74, 206, 8
LTEXT "including without limitation the rights to use, copy, modify, merge,", 1005, 10, 82, 206, 8
LTEXT "publish, distribute, sublicense, and/or sell copies of the Software,", 1006, 10, 90, 206, 8
LTEXT "and to permit persons to whom the Software is furnished to do so,", 1007, 10, 98, 206, 8
LTEXT "subject to the following conditions:", 1008, 10, 106, 206, 8
LTEXT "THE SOFTWARE IS PROVIDED ""AS IS"", WITHOUT", 1013, 10, 114, 206, 8 LTEXT "The above copyright notice and this permission notice shall be", 1010, 10, 122, 206, 8
LTEXT "WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,", 1014, 10, 122, 206, 8 LTEXT "included in all copies or substantial portions of the Software.", 1011, 10, 130, 206, 8
LTEXT "INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF", 1015, 10, 130, 206, 8
LTEXT "MERCHANTABILITY, FITNESS FOR A PARTICULAR", 1016, 10, 138, 206, 8 LTEXT "THE SOFTWARE IS PROVIDED ""AS IS"", WITHOUT", 1013, 10, 146, 206, 8
LTEXT "PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL", 1017, 10, 146, 206, 8 LTEXT "WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,", 1014, 10, 154, 206, 8
LTEXT "SIMON TATHAM BE LIABLE FOR ANY CLAIM, DAMAGES OR", 1018, 10, 154, 206, 8 LTEXT "INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF", 1015, 10, 162, 206, 8
LTEXT "OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,", 1019, 10, 162, 206, 8 LTEXT "MERCHANTABILITY, FITNESS FOR A PARTICULAR", 1016, 10, 170, 206, 8
LTEXT "TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN", 1020, 10, 170, 206, 8 LTEXT "PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE", 1017, 10, 178, 206, 8
LTEXT "CONNECTION WITH THE SOFTWARE OR THE USE OR", 1021, 10, 178, 206, 8 LTEXT "COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES", 1018, 10, 186, 206, 8
LTEXT "OTHER DEALINGS IN THE SOFTWARE.", 1022, 10, 186, 206, 8 LTEXT "OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,", 1019, 10, 194, 206, 8
LTEXT "TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN", 1020, 10, 202, 206, 8
LTEXT "CONNECTION WITH THE SOFTWARE OR THE USE OR", 1021, 10, 210, 206, 8
LTEXT "OTHER DEALINGS IN THE SOFTWARE.", 1022, 10, 218, 206, 8
END END

View File

@ -39,35 +39,39 @@ BEGIN
END END
/* No accelerators used */ /* No accelerators used */
214 DIALOG DISCARDABLE 50, 50, 226, 223 214 DIALOG DISCARDABLE 50, 50, 226, 255
STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
CAPTION "PuTTYgen Licence" CAPTION "PuTTY Licence"
FONT 8, "MS Sans Serif" FONT 8, "MS Sans Serif"
BEGIN BEGIN
DEFPUSHBUTTON "OK", IDOK, 98, 203, 44, 14 DEFPUSHBUTTON "OK", IDOK, 98, 235, 44, 14
LTEXT "Copyright \251 1997-2001 Simon Tatham", 1000, 10, 10, 206, 8 LTEXT "Copyright \251 1997-2001 Simon Tatham", 1000, 10, 10, 206, 8
LTEXT "Permission is hereby granted, free of charge, to any person", 1002, 10, 26, 206, 8 LTEXT "Portions copyright Robert de Bath, Joris van Rantwijk, Delian", 1002, 10, 26, 206, 8
LTEXT "obtaining a copy of this software and associated documentation", 1003, 10, 34, 206, 8 LTEXT "Delchev, Andreas Schultz, Jeroen Massar, Wez Furlong, Nicolas", 1003, 10, 34, 206, 8
LTEXT "files (the ""Software""), to deal in the Software without restriction,", 1004, 10, 42, 206, 8 LTEXT "Barry.", 1003, 10, 42, 206, 8
LTEXT "including without limitation the rights to use, copy, modify, merge,", 1005, 10, 50, 206, 8
LTEXT "publish, distribute, sublicense, and/or sell copies of the Software,", 1006, 10, 58, 206, 8
LTEXT "and to permit persons to whom the Software is furnished to do so,", 1007, 10, 66, 206, 8
LTEXT "subject to the following conditions:", 1008, 10, 74, 206, 8
LTEXT "The above copyright notice and this permission notice shall be", 1010, 10, 90, 206, 8 LTEXT "Permission is hereby granted, free of charge, to any person", 1002, 10, 58, 206, 8
LTEXT "included in all copies or substantial portions of the Software.", 1011, 10, 98, 206, 8 LTEXT "obtaining a copy of this software and associated documentation", 1003, 10, 66, 206, 8
LTEXT "files (the ""Software""), to deal in the Software without restriction,", 1004, 10, 74, 206, 8
LTEXT "including without limitation the rights to use, copy, modify, merge,", 1005, 10, 82, 206, 8
LTEXT "publish, distribute, sublicense, and/or sell copies of the Software,", 1006, 10, 90, 206, 8
LTEXT "and to permit persons to whom the Software is furnished to do so,", 1007, 10, 98, 206, 8
LTEXT "subject to the following conditions:", 1008, 10, 106, 206, 8
LTEXT "THE SOFTWARE IS PROVIDED ""AS IS"", WITHOUT", 1013, 10, 114, 206, 8 LTEXT "The above copyright notice and this permission notice shall be", 1010, 10, 122, 206, 8
LTEXT "WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,", 1014, 10, 122, 206, 8 LTEXT "included in all copies or substantial portions of the Software.", 1011, 10, 130, 206, 8
LTEXT "INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF", 1015, 10, 130, 206, 8
LTEXT "MERCHANTABILITY, FITNESS FOR A PARTICULAR", 1016, 10, 138, 206, 8 LTEXT "THE SOFTWARE IS PROVIDED ""AS IS"", WITHOUT", 1013, 10, 146, 206, 8
LTEXT "PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL", 1017, 10, 146, 206, 8 LTEXT "WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,", 1014, 10, 154, 206, 8
LTEXT "SIMON TATHAM BE LIABLE FOR ANY CLAIM, DAMAGES OR", 1018, 10, 154, 206, 8 LTEXT "INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF", 1015, 10, 162, 206, 8
LTEXT "OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,", 1019, 10, 162, 206, 8 LTEXT "MERCHANTABILITY, FITNESS FOR A PARTICULAR", 1016, 10, 170, 206, 8
LTEXT "TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN", 1020, 10, 170, 206, 8 LTEXT "PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE", 1017, 10, 178, 206, 8
LTEXT "CONNECTION WITH THE SOFTWARE OR THE USE OR", 1021, 10, 178, 206, 8 LTEXT "COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES", 1018, 10, 186, 206, 8
LTEXT "OTHER DEALINGS IN THE SOFTWARE.", 1022, 10, 186, 206, 8 LTEXT "OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,", 1019, 10, 194, 206, 8
LTEXT "TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN", 1020, 10, 202, 206, 8
LTEXT "CONNECTION WITH THE SOFTWARE OR THE USE OR", 1021, 10, 210, 206, 8
LTEXT "OTHER DEALINGS IN THE SOFTWARE.", 1022, 10, 218, 206, 8
END END

View File

@ -66,35 +66,39 @@ BEGIN
END END
/* No accelerators used */ /* No accelerators used */
IDD_LICENCEBOX DIALOG DISCARDABLE 50, 50, 226, 223 IDD_LICENCEBOX DIALOG DISCARDABLE 50, 50, 226, 255
STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
CAPTION "PuTTY Licence" CAPTION "PuTTY Licence"
FONT 8, "MS Sans Serif" FONT 8, "MS Sans Serif"
BEGIN BEGIN
DEFPUSHBUTTON "OK", IDOK, 98, 203, 44, 14 DEFPUSHBUTTON "OK", IDOK, 98, 235, 44, 14
LTEXT "Copyright \251 1997-2001 Simon Tatham", 1000, 10, 10, 206, 8 LTEXT "Copyright \251 1997-2001 Simon Tatham", 1000, 10, 10, 206, 8
LTEXT "Permission is hereby granted, free of charge, to any person", 1002, 10, 26, 206, 8 LTEXT "Portions copyright Robert de Bath, Joris van Rantwijk, Delian", 1002, 10, 26, 206, 8
LTEXT "obtaining a copy of this software and associated documentation", 1003, 10, 34, 206, 8 LTEXT "Delchev, Andreas Schultz, Jeroen Massar, Wez Furlong, Nicolas", 1003, 10, 34, 206, 8
LTEXT "files (the ""Software""), to deal in the Software without restriction,", 1004, 10, 42, 206, 8 LTEXT "Barry.", 1003, 10, 42, 206, 8
LTEXT "including without limitation the rights to use, copy, modify, merge,", 1005, 10, 50, 206, 8
LTEXT "publish, distribute, sublicense, and/or sell copies of the Software,", 1006, 10, 58, 206, 8
LTEXT "and to permit persons to whom the Software is furnished to do so,", 1007, 10, 66, 206, 8
LTEXT "subject to the following conditions:", 1008, 10, 74, 206, 8
LTEXT "The above copyright notice and this permission notice shall be", 1010, 10, 90, 206, 8 LTEXT "Permission is hereby granted, free of charge, to any person", 1002, 10, 58, 206, 8
LTEXT "included in all copies or substantial portions of the Software.", 1011, 10, 98, 206, 8 LTEXT "obtaining a copy of this software and associated documentation", 1003, 10, 66, 206, 8
LTEXT "files (the ""Software""), to deal in the Software without restriction,", 1004, 10, 74, 206, 8
LTEXT "including without limitation the rights to use, copy, modify, merge,", 1005, 10, 82, 206, 8
LTEXT "publish, distribute, sublicense, and/or sell copies of the Software,", 1006, 10, 90, 206, 8
LTEXT "and to permit persons to whom the Software is furnished to do so,", 1007, 10, 98, 206, 8
LTEXT "subject to the following conditions:", 1008, 10, 106, 206, 8
LTEXT "THE SOFTWARE IS PROVIDED ""AS IS"", WITHOUT", 1013, 10, 114, 206, 8 LTEXT "The above copyright notice and this permission notice shall be", 1010, 10, 122, 206, 8
LTEXT "WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,", 1014, 10, 122, 206, 8 LTEXT "included in all copies or substantial portions of the Software.", 1011, 10, 130, 206, 8
LTEXT "INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF", 1015, 10, 130, 206, 8
LTEXT "MERCHANTABILITY, FITNESS FOR A PARTICULAR", 1016, 10, 138, 206, 8 LTEXT "THE SOFTWARE IS PROVIDED ""AS IS"", WITHOUT", 1013, 10, 146, 206, 8
LTEXT "PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL", 1017, 10, 146, 206, 8 LTEXT "WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,", 1014, 10, 154, 206, 8
LTEXT "SIMON TATHAM BE LIABLE FOR ANY CLAIM, DAMAGES OR", 1018, 10, 154, 206, 8 LTEXT "INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF", 1015, 10, 162, 206, 8
LTEXT "OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,", 1019, 10, 162, 206, 8 LTEXT "MERCHANTABILITY, FITNESS FOR A PARTICULAR", 1016, 10, 170, 206, 8
LTEXT "TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN", 1020, 10, 170, 206, 8 LTEXT "PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE", 1017, 10, 178, 206, 8
LTEXT "CONNECTION WITH THE SOFTWARE OR THE USE OR", 1021, 10, 178, 206, 8 LTEXT "COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES", 1018, 10, 186, 206, 8
LTEXT "OTHER DEALINGS IN THE SOFTWARE.", 1022, 10, 186, 206, 8 LTEXT "OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,", 1019, 10, 194, 206, 8
LTEXT "TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN", 1020, 10, 202, 206, 8
LTEXT "CONNECTION WITH THE SOFTWARE OR THE USE OR", 1021, 10, 210, 206, 8
LTEXT "OTHER DEALINGS IN THE SOFTWARE.", 1022, 10, 218, 206, 8
END END