diff --git a/android/debian/apt-installs.sh b/android/debian/apt-installs.sh
index f0c28fa0..d1eaf138 100755
--- a/android/debian/apt-installs.sh
+++ b/android/debian/apt-installs.sh
@@ -24,7 +24,7 @@ apt-get install -y --no-install-recommends \
   python3-tk \
   ccache \
   libltdl-dev
- 
+
 # set python3 as default.
 # make python alternatives selectable.
 # (debian stretch, adapt for different versions)
diff --git a/contrib/help-pages-translation-to-french/all.htm b/contrib/help-pages-translation-to-french/all.htm
index 8384aa52..e854d438 100644
--- a/contrib/help-pages-translation-to-french/all.htm
+++ b/contrib/help-pages-translation-to-french/all.htm
@@ -10533,31 +10533,31 @@ played to the waste by clicking on them.  Points are made as follows:
 
 <dl>
     <dd>When a hand is dealt 52 points are subtracted from the score.
-    
+
     <dd>For each of the first four cards played from the tableau in a
 	sequence one point is added.
-    
+
     <dd>For each of the second four cards played from the tableau in a
 	sequence two points are added.
-    
+
     <dd>Then four points for the next four cards, eight for the next four,
 	then sixteen etc.
-    
+
     <dd>If one peak is empty the points added are doubled.
-    
+
     <dd>If two peaks are empty the points added are quadrupled.
-    
+
     <dd><p>
     <dd>Ten points are added for emptying the first peak.
-    
+
     <dd>Twenty points are added for the second peak.
-    
+
     <dd>Forty points are added for emptying the last peak.
-    
+
     <dd><p>
     <dd>When all the cards are removed from the tableau ten points are
 	added for each card remaining in the talon.
-    
+
     <dd><p>
     <dd>The highest possible score for a single hand is 2336 points.
 
diff --git a/contrib/help-pages-translation-to-french/credits.html b/contrib/help-pages-translation-to-french/credits.html
index ca1d4527..f31966ad 100644
--- a/contrib/help-pages-translation-to-french/credits.html
+++ b/contrib/help-pages-translation-to-french/credits.html
@@ -12,22 +12,22 @@
 <ul>
 <li> T. Kirk &lt;grania@mailcity.com&gt;<br> beaucoup de Ganjifa <a href="ganjifa.html">Ganjifa</a>, <a href="hanafuda.html">Hanafuda</a> et de jeux de type Tarot.
 </li><li>  Andrew Csillag &lt;andrew@starmedia.net&gt;
-  
+
   <ul>
      <li> <a href="rules/canfield.html">Canfield</a>
   </li></ul>
 </li><li>  Deon Ramsey &lt;miavir@furry.de&gt;
-  
+
   <ul>
      <li> <a href="rules/nomad.html">Nomad</a>
   </li></ul>
 </li><li>  Galen Brooks &lt;galen@nine.com&gt;
-  
+
   <ul>
      <li> <a href="rules/numerica.html">Numerica</a>
   </li></ul>
 </li><li>  Matthew Hohlfeld &lt;hohlfeld@cs.ucsd.edu&gt;
-  
+
   <ul>
      <li> <a href="rules/larasgame.html">Lara's Game</a>
   </li></ul>
diff --git a/contrib/help-pages-translation-to-french/howtoplay.html b/contrib/help-pages-translation-to-french/howtoplay.html
index a25c940e..b4934109 100644
--- a/contrib/help-pages-translation-to-french/howtoplay.html
+++ b/contrib/help-pages-translation-to-french/howtoplay.html
@@ -1,114 +1,114 @@
-<h1>Comment jouer à PySol</h1>
-
-<h2>Utilisation de la souris</h2>
-<p>
-Bouton Gauche:
-<ul type="disc">
-<li> Déplacer les cartes
-</li><li> Cliquez sur le talon pour distribuer de nouvelles cartes.
-</li></ul>
-<p>
-Bouton Droit (ou double-clic Gauche)
-<ul type="disc">
-<li> Déplacer les cartes vers les fondations
-</li><li> Jeu rapide (si activé)
-</li></ul>
-<p>
-Bouton du Milieu (ou Ctrl+clic Droit):
-<ul type="disc">
-<li> Voir les cartes partiellement cachées
-</li></ul>
-<p>
-Ctrl+Clic Gauche:
-<ul type="disc">
-<li> Affiche en surbrillance toutes les cartes correspondantes.
-</li></ul>
-<p>
-Maj+Clic Gauche:
-<ul type="disc">
-<li> Affiche en surbrillance toutes les cartes de même valeur.
-</li></ul>
-
-
-<h2>Jeu à deux mains</h2>
-<p>
-Placer trois doigts sur '<i>A</i>' (déplacer auto), '<i>S</i>' (annuler) et '<i>D</i>' (distribuer). Vous pouvez ainsi atteindre '<i>R</i>' (répéter).
-<p>
-Les gauchers préféreront '<i>L</i>' (déplacer auto), '<i>K</i>' (annuler) et '<i>J</i>' (distribuer).
-
-<!--
-<h2>Point-and-Click play</h2>
-<p>
-If you prefer Point-and-Click over Drag-and-Drop you can enable
-<i>Quick play</i> and use the right mouse button. See below.
--->
-
-<h2>Jeu automatique</h2>
-<p>
-Notez que le jeu automatique peut gâcher le jeu. Évitez de l'activer. Ou n'utilisez que le <i>retournement automatique</i>. Certains jeux désactivent automatiquement cette fonctionnalité, sinon ils n'ont plus aucun intérêt.
-<p>
-Retourner automatiquement
-<ul type="disc">
-<li> Retourne automatiquement toutes les cartes.
-</li></ul>
-Déplacement automatiquement
-<ul type="disc">
-<li> Déplace automatiquement les cartes vers les fondations.
-</li></ul>
-Distribuer automatiquement
-<ul type="disc">
-<li> Distribue automatiquement les cartes à la défausse si elle est vide.
-</li></ul>
-Jeu rapide
-<ul type="disc">
-<li> Utilisez le bouton droit de la souris pour déplacer rapidement les piles de cartes. Ce système n'est pas très intuitif, il n'utilise pas le système d'indice.
-</li></ul>
-
-
-<h2>L'animation est trop lente...</h2>
-<p>
-Malheureusement, il manque un concept de sprite à Tcl/Tk toolkit, ce qui provoque (double-buffer invisible), beaucoup de répétition de dessin lors du déplacement des cartes.
-<p>
-Désactiver l'<i>ombre des cartes</i>, l'<i>ombrage des mouvements possibles</i>, la mosaïque d'arrière-plan de table et les sons améliorera l'affichage.
-
-
-<h2>Les arrière-plans de table sont de mauvaise qualité</h2>
-<p>
-Ils ne doivent être activés qu'en mode couleurs vraies - sinon la qualité sera mauvaise en raison du tramage.
-<p>
-Vous pouvez ajouter vos propres mosaïques d'arrière-plan. Pour ce faire, copiez les images dans le répertoire <i>data/tiles</i> ou dans <i>~/.PySolFC/tiles</i> de votre répertoire personnel.
-<!-- They must be in GIF or PPM format. -->
-
-
-<h2>Notes à propos du système de score</h2>
-<p>
-<ul type="disc">
-<li> La prise en compte des scores commence après le premier mouvement. Même si vous annulez tous les mouvements, les scores ne sera pas annulé.
-</li><li> Vous perdrez la partie si vous utilisez un indice ou si vous démarrer la démo.
-</li><li> Vous pouvez recommencer à tout moment pour avoir une chance supplémentaire de gagner.
-</li><li> Si vous ne voulez pas enregistrer le score d'un jeu perdu, vous pouvez temporairement modifiez les paramètres du joueur.
-</li><li> Les parties chargées ne comptent pas.
-</li><li> Si vous gagnez une partie sans utiliser <i>Annuler</i>, <i>Jeu rapide</i> ni aucune des autres fonctions d'assistance, vous recevrez une récompense spéciale.
-<!--
-<li> There are no score values in PySol - you win a game, or you lose it.
-     And don't even think about asking me to implement this nonsense - get
-     a nice pinball game if you're a highscore freak...
--->
-</li><li> Enfin, gardez toujours à l'esprit que ceci est un jeu de <b>Patience</b>. Détendez-vos et amusez-vous.
-</li></ul>
-
-
-<h2>Raccourcis clavier non-documentés</h2>
-<ul type="disc">
-<li> <i>Space</i> - Distribuer
-</li><li> <i>S</i> - Annuler
-</li><li> <i>Retour arrière</i> - Annuler
-</li><li> 
-<i>Ctrl-A</i> - Déplacement + Retournement automatique
-</li><li> <i>Ctrl-B</i> - Changer l'arrière-plan des cartes
-</li><li> <i>Ctrl-H</i> - Afficher le classement interne en donnant un indice
-</li><li> <i>Ctrl-I</i> - Changer de mosaïque de table
-</li><li> <i>Ctrl-N</i> - Débuter une nouvelle partie avec le numéro de jeu suivant
-</li><li> <i>Ctrl-P</i> - Modifier le nom du joueur
-</li><li> <i>Ctrl-U</i> - Jouer la musique suivante
-</li></ul>
+<h1>Comment jouer à PySol</h1>
+
+<h2>Utilisation de la souris</h2>
+<p>
+Bouton Gauche:
+<ul type="disc">
+<li> Déplacer les cartes
+</li><li> Cliquez sur le talon pour distribuer de nouvelles cartes.
+</li></ul>
+<p>
+Bouton Droit (ou double-clic Gauche)
+<ul type="disc">
+<li> Déplacer les cartes vers les fondations
+</li><li> Jeu rapide (si activé)
+</li></ul>
+<p>
+Bouton du Milieu (ou Ctrl+clic Droit):
+<ul type="disc">
+<li> Voir les cartes partiellement cachées
+</li></ul>
+<p>
+Ctrl+Clic Gauche:
+<ul type="disc">
+<li> Affiche en surbrillance toutes les cartes correspondantes.
+</li></ul>
+<p>
+Maj+Clic Gauche:
+<ul type="disc">
+<li> Affiche en surbrillance toutes les cartes de même valeur.
+</li></ul>
+
+
+<h2>Jeu à deux mains</h2>
+<p>
+Placer trois doigts sur '<i>A</i>' (déplacer auto), '<i>S</i>' (annuler) et '<i>D</i>' (distribuer). Vous pouvez ainsi atteindre '<i>R</i>' (répéter).
+<p>
+Les gauchers préféreront '<i>L</i>' (déplacer auto), '<i>K</i>' (annuler) et '<i>J</i>' (distribuer).
+
+<!--
+<h2>Point-and-Click play</h2>
+<p>
+If you prefer Point-and-Click over Drag-and-Drop you can enable
+<i>Quick play</i> and use the right mouse button. See below.
+-->
+
+<h2>Jeu automatique</h2>
+<p>
+Notez que le jeu automatique peut gâcher le jeu. Évitez de l'activer. Ou n'utilisez que le <i>retournement automatique</i>. Certains jeux désactivent automatiquement cette fonctionnalité, sinon ils n'ont plus aucun intérêt.
+<p>
+Retourner automatiquement
+<ul type="disc">
+<li> Retourne automatiquement toutes les cartes.
+</li></ul>
+Déplacement automatiquement
+<ul type="disc">
+<li> Déplace automatiquement les cartes vers les fondations.
+</li></ul>
+Distribuer automatiquement
+<ul type="disc">
+<li> Distribue automatiquement les cartes à la défausse si elle est vide.
+</li></ul>
+Jeu rapide
+<ul type="disc">
+<li> Utilisez le bouton droit de la souris pour déplacer rapidement les piles de cartes. Ce système n'est pas très intuitif, il n'utilise pas le système d'indice.
+</li></ul>
+
+
+<h2>L'animation est trop lente...</h2>
+<p>
+Malheureusement, il manque un concept de sprite à Tcl/Tk toolkit, ce qui provoque (double-buffer invisible), beaucoup de répétition de dessin lors du déplacement des cartes.
+<p>
+Désactiver l'<i>ombre des cartes</i>, l'<i>ombrage des mouvements possibles</i>, la mosaïque d'arrière-plan de table et les sons améliorera l'affichage.
+
+
+<h2>Les arrière-plans de table sont de mauvaise qualité</h2>
+<p>
+Ils ne doivent être activés qu'en mode couleurs vraies - sinon la qualité sera mauvaise en raison du tramage.
+<p>
+Vous pouvez ajouter vos propres mosaïques d'arrière-plan. Pour ce faire, copiez les images dans le répertoire <i>data/tiles</i> ou dans <i>~/.PySolFC/tiles</i> de votre répertoire personnel.
+<!-- They must be in GIF or PPM format. -->
+
+
+<h2>Notes à propos du système de score</h2>
+<p>
+<ul type="disc">
+<li> La prise en compte des scores commence après le premier mouvement. Même si vous annulez tous les mouvements, les scores ne sera pas annulé.
+</li><li> Vous perdrez la partie si vous utilisez un indice ou si vous démarrer la démo.
+</li><li> Vous pouvez recommencer à tout moment pour avoir une chance supplémentaire de gagner.
+</li><li> Si vous ne voulez pas enregistrer le score d'un jeu perdu, vous pouvez temporairement modifiez les paramètres du joueur.
+</li><li> Les parties chargées ne comptent pas.
+</li><li> Si vous gagnez une partie sans utiliser <i>Annuler</i>, <i>Jeu rapide</i> ni aucune des autres fonctions d'assistance, vous recevrez une récompense spéciale.
+<!--
+<li> There are no score values in PySol - you win a game, or you lose it.
+     And don't even think about asking me to implement this nonsense - get
+     a nice pinball game if you're a highscore freak...
+-->
+</li><li> Enfin, gardez toujours à l'esprit que ceci est un jeu de <b>Patience</b>. Détendez-vos et amusez-vous.
+</li></ul>
+
+
+<h2>Raccourcis clavier non-documentés</h2>
+<ul type="disc">
+<li> <i>Space</i> - Distribuer
+</li><li> <i>S</i> - Annuler
+</li><li> <i>Retour arrière</i> - Annuler
+</li><li>
+<i>Ctrl-A</i> - Déplacement + Retournement automatique
+</li><li> <i>Ctrl-B</i> - Changer l'arrière-plan des cartes
+</li><li> <i>Ctrl-H</i> - Afficher le classement interne en donnant un indice
+</li><li> <i>Ctrl-I</i> - Changer de mosaïque de table
+</li><li> <i>Ctrl-N</i> - Débuter une nouvelle partie avec le numéro de jeu suivant
+</li><li> <i>Ctrl-P</i> - Modifier le nom du joueur
+</li><li> <i>Ctrl-U</i> - Jouer la musique suivante
+</li></ul>
diff --git a/contrib/help-pages-translation-to-french/license.html b/contrib/help-pages-translation-to-french/license.html
index 8761d585..3f51d7f4 100644
--- a/contrib/help-pages-translation-to-french/license.html
+++ b/contrib/help-pages-translation-to-french/license.html
@@ -5,10 +5,10 @@
 
 
 <p>
- 
+
  Copyright (C) 2007 <a href="http://fsf.org/">Free Software Foundation, Inc.</a>
 <p>
- 
+
  Everyone is permitted to copy and distribute verbatim copies
  of this license document, but changing it is not allowed.
 
@@ -18,26 +18,26 @@
                        <b>TERMS AND CONDITIONS</b>
 
 <p>
-  
+
   0. Definitions.
 
 
 
 <p>
-  
+
   "This License" refers to version 3 of the GNU General Public License.
 
 
 
 <p>
-  
+
   "Copyright" also means copyright-like laws that apply to other kinds of
 works, such as semiconductor masks.
 
 
 
 <p>
-  
+
   "The Program" refers to any copyrightable work licensed under this
 License.  Each licensee is addressed as "you".  "Licensees" and
 "recipients" may be individuals or organizations.
@@ -45,7 +45,7 @@ License.  Each licensee is addressed as "you".  "Licensees" and
 
 
 <p>
-  
+
   To "modify" a work means to copy from or adapt all or part of the work
 in a fashion requiring copyright permission, other than the making of an
 exact copy.  The resulting work is called a "modified version" of the
@@ -54,14 +54,14 @@ earlier work or a work "based on" the earlier work.
 
 
 <p>
-  
+
   A "covered work" means either the unmodified Program or a work based
 on the Program.
 
 
 
 <p>
-  
+
   To "propagate" a work means to do anything with it that, without
 permission, would make you directly or secondarily liable for
 infringement under applicable copyright law, except executing it on a
@@ -72,7 +72,7 @@ public, and in some countries other activities as well.
 
 
 <p>
-  
+
   To "convey" a work means any kind of propagation that enables other
 parties to make or receive copies.  Mere interaction with a user through
 a computer network, with no transfer of a copy, is not conveying.
@@ -80,7 +80,7 @@ a computer network, with no transfer of a copy, is not conveying.
 
 
 <p>
-  
+
   An interactive user interface displays "Appropriate Legal Notices"
 to the extent that it includes a convenient and prominently visible
 feature that (1) displays an appropriate copyright notice, and (2)
@@ -93,13 +93,13 @@ menu, a prominent item in the list meets this criterion.
 
 
 <p>
-  
+
   1. Source Code.
 
 
 
 <p>
-  
+
   The "source code" for a work means the preferred form of the work
 for making modifications to it.  "Object code" means any non-source
 form of a work.
@@ -107,7 +107,7 @@ form of a work.
 
 
 <p>
-  
+
   A "Standard Interface" means an interface that either is an official
 standard defined by a recognized standards body, or, in the case of
 interfaces specified for a particular programming language, one that
@@ -116,7 +116,7 @@ is widely used among developers working in that language.
 
 
 <p>
-  
+
   The "System Libraries" of an executable work include anything, other
 than the work as a whole, that (a) is included in the normal form of
 packaging a Major Component, but which is not part of that Major
@@ -131,7 +131,7 @@ produce the work, or an object code interpreter used to run it.
 
 
 <p>
-  
+
   The "Corresponding Source" for a work in object code form means all
 the source code needed to generate, install, and (for an executable
 work) run the object code and to modify the work, including scripts to
@@ -148,7 +148,7 @@ subprograms and other parts of the work.
 
 
 <p>
-  
+
   The Corresponding Source need not include anything that users
 can regenerate automatically from other parts of the Corresponding
 Source.
@@ -156,20 +156,20 @@ Source.
 
 
 <p>
-  
+
   The Corresponding Source for a work in source code form is that
 same work.
 
 
 
 <p>
-  
+
   2. Basic Permissions.
 
 
 
 <p>
-  
+
   All rights granted under this License are granted for the term of
 copyright on the Program, and are irrevocable provided the stated
 conditions are met.  This License explicitly affirms your unlimited
@@ -181,7 +181,7 @@ rights of fair use or other equivalent, as provided by copyright law.
 
 
 <p>
-  
+
   You may make, run and propagate covered works that you do not
 convey, without conditions so long as your license otherwise remains
 in force.  You may convey covered works to others for the sole purpose
@@ -196,7 +196,7 @@ your copyrighted material outside their relationship with you.
 
 
 <p>
-  
+
   Conveying under any other circumstances is permitted solely under
 the conditions stated below.  Sublicensing is not allowed; section 10
 makes it unnecessary.
@@ -204,13 +204,13 @@ makes it unnecessary.
 
 
 <p>
-  
+
   3. Protecting Users' Legal Rights From Anti-Circumvention Law.
 
 
 
 <p>
-  
+
   No covered work shall be deemed part of an effective technological
 measure under any applicable law fulfilling obligations under article
 11 of the WIPO copyright treaty adopted on 20 December 1996, or
@@ -220,7 +220,7 @@ measures.
 
 
 <p>
-  
+
   When you convey a covered work, you waive any legal power to forbid
 circumvention of technological measures to the extent such circumvention
 is effected by exercising rights under this License with respect to
@@ -232,13 +232,13 @@ technological measures.
 
 
 <p>
-  
+
   4. Conveying Verbatim Copies.
 
 
 
 <p>
-  
+
   You may convey verbatim copies of the Program's source code as you
 receive it, in any medium, provided that you conspicuously and
 appropriately publish on each copy an appropriate copyright notice;
@@ -250,20 +250,20 @@ recipients a copy of this License along with the Program.
 
 
 <p>
-  
+
   You may charge any price or no price for each copy that you convey,
 and you may offer support or warranty protection for a fee.
 
 
 
 <p>
-  
+
   5. Conveying Modified Source Versions.
 
 
 
 <p>
-  
+
   You may convey a work based on the Program, or the modifications to
 produce it from the Program, in the form of source code under the
 terms of section 4, provided that you also meet all of these conditions:
@@ -271,14 +271,14 @@ terms of section 4, provided that you also meet all of these conditions:
 
 
 <p>
-    
+
     a) The work must carry prominent notices stating that you modified
     it, and giving a relevant date.
 
 
 
 <p>
-    
+
     b) The work must carry prominent notices stating that it is
     released under this License and any conditions added under section
     7.  This requirement modifies the requirement in section 4 to
@@ -287,7 +287,7 @@ terms of section 4, provided that you also meet all of these conditions:
 
 
 <p>
-    
+
     c) You must license the entire work, as a whole, under this
     License to anyone who comes into possession of a copy.  This
     License will therefore apply, along with any applicable section 7
@@ -299,7 +299,7 @@ terms of section 4, provided that you also meet all of these conditions:
 
 
 <p>
-    
+
     d) If the work has interactive user interfaces, each must display
     Appropriate Legal Notices; however, if the Program has interactive
     interfaces that do not display Appropriate Legal Notices, your
@@ -308,7 +308,7 @@ terms of section 4, provided that you also meet all of these conditions:
 
 
 <p>
-  
+
   A compilation of a covered work with other separate and independent
 works, which are not by their nature extensions of the covered work,
 and which are not combined with it such as to form a larger program,
@@ -322,13 +322,13 @@ parts of the aggregate.
 
 
 <p>
-  
+
   6. Conveying Non-Source Forms.
 
 
 
 <p>
-  
+
   You may convey a covered work in object code form under the terms
 of sections 4 and 5, provided that you also convey the
 machine-readable Corresponding Source under the terms of this License,
@@ -337,7 +337,7 @@ in one of these ways:
 
 
 <p>
-    
+
     a) Convey the object code in, or embodied in, a physical product
     (including a physical distribution medium), accompanied by the
     Corresponding Source fixed on a durable physical medium
@@ -346,7 +346,7 @@ in one of these ways:
 
 
 <p>
-    
+
     b) Convey the object code in, or embodied in, a physical product
     (including a physical distribution medium), accompanied by a
     written offer, valid for at least three years and valid for as
@@ -362,7 +362,7 @@ in one of these ways:
 
 
 <p>
-    
+
     c) Convey individual copies of the object code with a copy of the
     written offer to provide the Corresponding Source.  This
     alternative is allowed only occasionally and noncommercially, and
@@ -372,7 +372,7 @@ in one of these ways:
 
 
 <p>
-    
+
     d) Convey the object code by offering access from a designated
     place (gratis or for a charge), and offer equivalent access to the
     Corresponding Source in the same way through the same place at no
@@ -389,7 +389,7 @@ in one of these ways:
 
 
 <p>
-    
+
     e) Convey the object code using peer-to-peer transmission, provided
     you inform other peers where the object code and Corresponding
     Source of the work are being offered to the general public at no
@@ -398,7 +398,7 @@ in one of these ways:
 
 
 <p>
-  
+
   A separable portion of the object code, whose source code is excluded
 from the Corresponding Source as a System Library, need not be
 included in conveying the object code work.
@@ -406,7 +406,7 @@ included in conveying the object code work.
 
 
 <p>
-  
+
   A "User Product" is either (1) a "consumer product", which means any
 tangible personal property which is normally used for personal, family,
 or household purposes, or (2) anything designed or sold for incorporation
@@ -423,7 +423,7 @@ the only significant mode of use of the product.
 
 
 <p>
-  
+
   "Installation Information" for a User Product means any methods,
 procedures, authorization keys, or other information required to install
 and execute modified versions of a covered work in that User Product from
@@ -435,7 +435,7 @@ modification has been made.
 
 
 <p>
-  
+
   If you convey an object code work under this section in, or with, or
 specifically for use in, a User Product, and the conveying occurs as
 part of a transaction in which the right of possession and use of the
@@ -450,7 +450,7 @@ been installed in ROM).
 
 
 <p>
-  
+
   The requirement to provide Installation Information does not include a
 requirement to continue to provide support service, warranty, or updates
 for a work that has been modified or installed by the recipient, or for
@@ -462,7 +462,7 @@ protocols for communication across the network.
 
 
 <p>
-  
+
   Corresponding Source conveyed, and Installation Information provided,
 in accord with this section must be in a format that is publicly
 documented (and with an implementation available to the public in
@@ -472,13 +472,13 @@ unpacking, reading or copying.
 
 
 <p>
-  
+
   7. Additional Terms.
 
 
 
 <p>
-  
+
   "Additional permissions" are terms that supplement the terms of this
 License by making exceptions from one or more of its conditions.
 Additional permissions that are applicable to the entire Program shall
@@ -491,7 +491,7 @@ this License without regard to the additional permissions.
 
 
 <p>
-  
+
   When you convey a copy of a covered work, you may at your option
 remove any additional permissions from that copy, or from any part of
 it.  (Additional permissions may be written to require their own
@@ -502,7 +502,7 @@ for which you have or can give appropriate copyright permission.
 
 
 <p>
-  
+
   Notwithstanding any other provision of this License, for material you
 add to a covered work, you may (if authorized by the copyright holders of
 that material) supplement the terms of this License with terms:
@@ -510,14 +510,14 @@ that material) supplement the terms of this License with terms:
 
 
 <p>
-    
+
     a) Disclaiming warranty or limiting liability differently from the
     terms of sections 15 and 16 of this License; or
 
 
 
 <p>
-    
+
     b) Requiring preservation of specified reasonable legal notices or
     author attributions in that material or in the Appropriate Legal
     Notices displayed by works containing it; or
@@ -525,7 +525,7 @@ that material) supplement the terms of this License with terms:
 
 
 <p>
-    
+
     c) Prohibiting misrepresentation of the origin of that material, or
     requiring that modified versions of such material be marked in
     reasonable ways as different from the original version; or
@@ -533,21 +533,21 @@ that material) supplement the terms of this License with terms:
 
 
 <p>
-    
+
     d) Limiting the use for publicity purposes of names of licensors or
     authors of the material; or
 
 
 
 <p>
-    
+
     e) Declining to grant rights under trademark law for use of some
     trade names, trademarks, or service marks; or
 
 
 
 <p>
-    
+
     f) Requiring indemnification of licensors and authors of that
     material by anyone who conveys the material (or modified versions of
     it) with contractual assumptions of liability to the recipient, for
@@ -557,7 +557,7 @@ that material) supplement the terms of this License with terms:
 
 
 <p>
-  
+
   All other non-permissive additional terms are considered "further
 restrictions" within the meaning of section 10.  If the Program as you
 received it, or any part of it, contains a notice stating that it is
@@ -571,7 +571,7 @@ not survive such relicensing or conveying.
 
 
 <p>
-  
+
   If you add terms to a covered work in accord with this section, you
 must place, in the relevant source files, a statement of the
 additional terms that apply to those files, or a notice indicating
@@ -580,7 +580,7 @@ where to find the applicable terms.
 
 
 <p>
-  
+
   Additional terms, permissive or non-permissive, may be stated in the
 form of a separately written license, or stated as exceptions;
 the above requirements apply either way.
@@ -588,13 +588,13 @@ the above requirements apply either way.
 
 
 <p>
-  
+
   8. Termination.
 
 
 
 <p>
-  
+
   You may not propagate or modify a covered work except as expressly
 provided under this License.  Any attempt otherwise to propagate or
 modify it is void, and will automatically terminate your rights under
@@ -604,7 +604,7 @@ paragraph of section 11).
 
 
 <p>
-  
+
   However, if you cease all violation of this License, then your
 license from a particular copyright holder is reinstated (a)
 provisionally, unless and until the copyright holder explicitly and
@@ -615,7 +615,7 @@ prior to 60 days after the cessation.
 
 
 <p>
-  
+
   Moreover, your license from a particular copyright holder is
 reinstated permanently if the copyright holder notifies you of the
 violation by some reasonable means, this is the first time you have
@@ -626,7 +626,7 @@ your receipt of the notice.
 
 
 <p>
-  
+
   Termination of your rights under this section does not terminate the
 licenses of parties who have received copies or rights from you under
 this License.  If your rights have been terminated and not permanently
@@ -636,13 +636,13 @@ material under section 10.
 
 
 <p>
-  
+
   9. Acceptance Not Required for Having Copies.
 
 
 
 <p>
-  
+
   You are not required to accept this License in order to receive or
 run a copy of the Program.  Ancillary propagation of a covered work
 occurring solely as a consequence of using peer-to-peer transmission
@@ -655,13 +655,13 @@ covered work, you indicate your acceptance of this License to do so.
 
 
 <p>
-  
+
   10. Automatic Licensing of Downstream Recipients.
 
 
 
 <p>
-  
+
   Each time you convey a covered work, the recipient automatically
 receives a license from the original licensors, to run, modify and
 propagate that work, subject to this License.  You are not responsible
@@ -670,7 +670,7 @@ for enforcing compliance by third parties with this License.
 
 
 <p>
-  
+
   An "entity transaction" is a transaction transferring control of an
 organization, or substantially all assets of one, or subdividing an
 organization, or merging organizations.  If propagation of a covered
@@ -684,7 +684,7 @@ the predecessor has it or can get it with reasonable efforts.
 
 
 <p>
-  
+
   You may not impose any further restrictions on the exercise of the
 rights granted or affirmed under this License.  For example, you may
 not impose a license fee, royalty, or other charge for exercise of
@@ -696,13 +696,13 @@ sale, or importing the Program or any portion of it.
 
 
 <p>
-  
+
   11. Patents.
 
 
 
 <p>
-  
+
   A "contributor" is a copyright holder who authorizes use under this
 License of the Program or a work on which the Program is based.  The
 work thus licensed is called the contributor's "contributor version".
@@ -710,7 +710,7 @@ work thus licensed is called the contributor's "contributor version".
 
 
 <p>
-  
+
   A contributor's "essential patent claims" are all patent claims
 owned or controlled by the contributor, whether already acquired or
 hereafter acquired, that would be infringed by some manner, permitted
@@ -724,7 +724,7 @@ this License.
 
 
 <p>
-  
+
   Each contributor grants you a non-exclusive, worldwide, royalty-free
 patent license under the contributor's essential patent claims, to
 make, use, sell, offer for sale, import and otherwise run, modify and
@@ -733,7 +733,7 @@ propagate the contents of its contributor version.
 
 
 <p>
-  
+
   In the following three paragraphs, a "patent license" is any express
 agreement or commitment, however denominated, not to enforce a patent
 (such as an express permission to practice a patent or covenant not to
@@ -744,7 +744,7 @@ patent against the party.
 
 
 <p>
-  
+
   If you convey a covered work, knowingly relying on a patent license,
 and the Corresponding Source of the work is not available for anyone
 to copy, free of charge and under the terms of this License, through a
@@ -762,7 +762,7 @@ country that you have reason to believe are valid.
 
 
 <p>
-  
+
   If, pursuant to or in connection with a single transaction or
 arrangement, you convey, or propagate by procuring conveyance of, a
 covered work, and grant a patent license to some of the parties
@@ -774,7 +774,7 @@ work and works based on it.
 
 
 <p>
-  
+
   A patent license is "discriminatory" if it does not include within
 the scope of its coverage, prohibits the exercise of, or is
 conditioned on the non-exercise of one or more of the rights that are
@@ -793,7 +793,7 @@ or that patent license was granted, prior to 28 March 2007.
 
 
 <p>
-  
+
   Nothing in this License shall be construed as excluding or limiting
 any implied license or other defenses to infringement that may
 otherwise be available to you under applicable patent law.
@@ -801,13 +801,13 @@ otherwise be available to you under applicable patent law.
 
 
 <p>
-  
+
   12. No Surrender of Others' Freedom.
 
 
 
 <p>
-  
+
   If conditions are imposed on you (whether by court order, agreement or
 otherwise) that contradict the conditions of this License, they do not
 excuse you from the conditions of this License.  If you cannot convey a
@@ -821,13 +821,13 @@ License would be to refrain entirely from conveying the Program.
 
 
 <p>
-  
+
   13. Use with the GNU Affero General Public License.
 
 
 
 <p>
-  
+
   Notwithstanding any other provision of this License, you have
 permission to link or combine any covered work with a work licensed
 under version 3 of the GNU Affero General Public License into a single
@@ -840,13 +840,13 @@ combination as such.
 
 
 <p>
-  
+
   14. Revised Versions of this License.
 
 
 
 <p>
-  
+
   The Free Software Foundation may publish revised and/or new versions of
 the GNU General Public License from time to time.  Such new versions will
 be similar in spirit to the present version, but may differ in detail to
@@ -855,7 +855,7 @@ address new problems or concerns.
 
 
 <p>
-  
+
   Each version is given a distinguishing version number.  If the
 Program specifies that a certain numbered version of the GNU General
 Public License "or any later version" applies to it, you have the
@@ -868,7 +868,7 @@ by the Free Software Foundation.
 
 
 <p>
-  
+
   If the Program specifies that a proxy can decide which future
 versions of the GNU General Public License can be used, that proxy's
 public statement of acceptance of a version permanently authorizes you
@@ -877,7 +877,7 @@ to choose that version for the Program.
 
 
 <p>
-  
+
   Later license versions may give you additional or different
 permissions.  However, no additional obligations are imposed on any
 author or copyright holder as a result of your choosing to follow a
@@ -886,13 +886,13 @@ later version.
 
 
 <p>
-  
+
   15. Disclaimer of Warranty.
 
 
 
 <p>
-  
+
   THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
 APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
 HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
@@ -905,13 +905,13 @@ ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
 
 
 <p>
-  
+
   16. Limitation of Liability.
 
 
 
 <p>
-  
+
   IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
 WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
 THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
@@ -925,13 +925,13 @@ SUCH DAMAGES.
 
 
 <p>
-  
+
   17. Interpretation of Sections 15 and 16.
 
 
 
 <p>
-  
+
   If the disclaimer of warranty and limitation of liability provided
 above cannot be given local legal effect according to their terms,
 reviewing courts shall apply local law that most closely approximates
diff --git a/contrib/help-pages-translation-to-french/rules/bakersgame.html b/contrib/help-pages-translation-to-french/rules/bakersgame.html
index 09d07440..9d5358dd 100644
--- a/contrib/help-pages-translation-to-french/rules/bakersgame.html
+++ b/contrib/help-pages-translation-to-french/rules/bakersgame.html
@@ -1,23 +1,23 @@
-<h1>Baker's Game</h1>
-<p>
-Type FreeCell 1 jeu. 1 donne.
-
-<h3>But du jeu</h3>
-<p>
-Déplacez toutes les cartes vers les fondations.
-
-<h3>Description rapide</h3>
-<p>
-Similaire au <a href="freecell.html">FreeCell</a>, les suites étant formées par ordre décroissant, par couleur de cartes.
-
-<h3>Règles</h3>
-<p>
-Toutes les cartes sont distribuées en début de partie. 4 cellules libres sont à votre disposition, qui peuvent recevoir chacune une carte.
-<p>
-Une carte ne peut être placée que sur une carte de la même couleur de cartes.
-<p>
-Les cartes ne peuvent être déplacées que par groupe contenant le même nombre de cartes que de cellules libres disponibles. C'est-à-dire que s'il ne reste plus que deux cellules libres, vous ne pourrez déplacer qu'un groupe de deux cartes. 
-
-<h3>Pour info</h3>
-<p>
-Le jeu <i>Baker's Game</i> doit son nom du mathématicien C.L. Baker et fût d'abord publié dans la colonne <i>Mathematical Games</i> de juin 1968 de Martin Gardner dans le journal <i>Scientific American</i>.
+<h1>Baker's Game</h1>
+<p>
+Type FreeCell 1 jeu. 1 donne.
+
+<h3>But du jeu</h3>
+<p>
+Déplacez toutes les cartes vers les fondations.
+
+<h3>Description rapide</h3>
+<p>
+Similaire au <a href="freecell.html">FreeCell</a>, les suites étant formées par ordre décroissant, par couleur de cartes.
+
+<h3>Règles</h3>
+<p>
+Toutes les cartes sont distribuées en début de partie. 4 cellules libres sont à votre disposition, qui peuvent recevoir chacune une carte.
+<p>
+Une carte ne peut être placée que sur une carte de la même couleur de cartes.
+<p>
+Les cartes ne peuvent être déplacées que par groupe contenant le même nombre de cartes que de cellules libres disponibles. C'est-à-dire que s'il ne reste plus que deux cellules libres, vous ne pourrez déplacer qu'un groupe de deux cartes.
+
+<h3>Pour info</h3>
+<p>
+Le jeu <i>Baker's Game</i> doit son nom du mathématicien C.L. Baker et fût d'abord publié dans la colonne <i>Mathematical Games</i> de juin 1968 de Martin Gardner dans le journal <i>Scientific American</i>.
diff --git a/contrib/help-pages-translation-to-french/rules/freecell.html b/contrib/help-pages-translation-to-french/rules/freecell.html
index 73afd80d..07ce7b1e 100644
--- a/contrib/help-pages-translation-to-french/rules/freecell.html
+++ b/contrib/help-pages-translation-to-french/rules/freecell.html
@@ -1,21 +1,21 @@
-<h1>Type FreeCell</h1>
-<p>
-Type FreeCell 1 jeu. 1 donne.
-
-<h3>But du jeu</h3>
-<p>
-Déplacez toutes les cartes vers les fondations.
-
-<h3>Règles</h3>
-<p>
-Le FreeCell se joue avec un jeu de cartes. Toutes les cartes sont distribuées en début de partie. 4 cellules libres sont à votre disposition, qui peuvent recevoir chacune une carte.
-<p>
-Les suites sont formées par ordre décroissant, en alternant les couleurs. N'importe quelle carte ou suite de cartes peut être placée sur un emplacement vide.
-<p>
-Les cartes ne peuvent être déplacées que par groupe contenant le même nombre de cartes que de cellules libres disponibles. C'est-à-dire que s'il ne reste plus que deux cellules libres, vous ne pourrez déplacer qu'un groupe de deux cartes. 
-
-<h3>Notes</h3>
-<p>
-Les jeux numérotés dans plage de 1 à 32000 sont compatible avec ceux figurant dans la <a href="http://www.solitairelaboratory.com/fcfaq.html">FAQ FreeCell</a>. Pour obtenir des infos intéressantes sur le FreeCell et ses variantes, visitez cette page.
-<p>
-99.9% des jeux FreeCell peuvent être gagnés.
+<h1>Type FreeCell</h1>
+<p>
+Type FreeCell 1 jeu. 1 donne.
+
+<h3>But du jeu</h3>
+<p>
+Déplacez toutes les cartes vers les fondations.
+
+<h3>Règles</h3>
+<p>
+Le FreeCell se joue avec un jeu de cartes. Toutes les cartes sont distribuées en début de partie. 4 cellules libres sont à votre disposition, qui peuvent recevoir chacune une carte.
+<p>
+Les suites sont formées par ordre décroissant, en alternant les couleurs. N'importe quelle carte ou suite de cartes peut être placée sur un emplacement vide.
+<p>
+Les cartes ne peuvent être déplacées que par groupe contenant le même nombre de cartes que de cellules libres disponibles. C'est-à-dire que s'il ne reste plus que deux cellules libres, vous ne pourrez déplacer qu'un groupe de deux cartes.
+
+<h3>Notes</h3>
+<p>
+Les jeux numérotés dans plage de 1 à 32000 sont compatible avec ceux figurant dans la <a href="http://www.solitairelaboratory.com/fcfaq.html">FAQ FreeCell</a>. Pour obtenir des infos intéressantes sur le FreeCell et ses variantes, visitez cette page.
+<p>
+99.9% des jeux FreeCell peuvent être gagnés.
diff --git a/tests/style/style-trailing-space.t b/tests/style/style-trailing-space.t
index 0a61ee41..8309adc7 100644
--- a/tests/style/style-trailing-space.t
+++ b/tests/style/style-trailing-space.t
@@ -19,7 +19,7 @@ my $finder = Test::TrailingSpace->new(
     {
         root => '.',
         filename_regex =>
-qr/(?:(?:\.(?:t|pm|pl|PL|yml|json|arc|vim|py|tcl))|README(?:[\.\w]*)|Changes|LICENSE|MANIFEST(?:\.in)?|AUTHORS|COPYING)\z/,
+qr/(?:(?:\.(?:bash|sh|t|pm|pl|PL|yml|json|arc|vim|html|py|tcl|xhtml))|README(?:[\.\w]*)|Changes|LICENSE|MANIFEST(?:\.in)?|AUTHORS|COPYING)\z/,
     },
 );