Merge branch 'master' into sdl2.0

docs/en/html/OPTIONS.html

@@ -17,7 +17,7 @@
     <center>
       <h1>
         Tux&nbsp;Paint<br>
-        version 0.9.25
+        version 0.9.26
       </h1>
 
       <h2>
@@ -115,7 +115,7 @@
       </blockquote>
 
       <h2>
-        Mac&nbsp;OS&nbsp;X Users
+        macOS Users
       </h2>
 
       <blockquote>
@@ -389,7 +389,7 @@
             the <b>[Alt]</b> modifier key is being held. (This is
             typically used for providing a print dialog, similar to
             when pressing <b>[Alt]</b>+'Print' in Windows and
-            Mac&nbsp;OS&nbsp;X.)
+            macOS.)
           </p>
 
           <p>