From: Jacob Nevins <jacobn@chiark.greenend.org.uk>
Date: Mon, 3 Nov 2014 23:45:47 +0000 (+0000)
Subject: Rewrap Windows licence dialogs.
X-Git-Tag: 0.68~652
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=7ef8505c780735518504cdac93fa8a9d8e60576f;hp=-c;p=PuTTY.git

Rewrap Windows licence dialogs.

The extra contributor pushed one line past the edge.
---

7ef8505c780735518504cdac93fa8a9d8e60576f
diff --git a/windows/pageant.rc b/windows/pageant.rc
index ec2b804d..d354a9c7 100644
--- a/windows/pageant.rc
+++ b/windows/pageant.rc
@@ -50,41 +50,42 @@ BEGIN
 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 "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, Christopher Staite, 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 --git a/windows/puttygen.rc b/windows/puttygen.rc
index 6329e915..63c0bcc0 100644
--- a/windows/puttygen.rc
+++ b/windows/puttygen.rc
@@ -43,41 +43,42 @@ BEGIN
 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 "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, Christopher Staite, 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 --git a/windows/win_res.rc2 b/windows/win_res.rc2
index f312c5bc..d0273350 100644
--- a/windows/win_res.rc2
+++ b/windows/win_res.rc2
@@ -51,41 +51,42 @@ BEGIN
 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 "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, Christopher Staite, 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