Merge branch '5.1' into 5.2

* 5.1:
  Fix select & plural message format

Author: javiereguiluz

translation/message_format.rst

@@ -271,27 +271,24 @@ Usage of this string is the same as with variables and select::
     .. code-block:: text
 
         {gender_of_host, select,
-            female {
-                {num_guests, plural, offset:1
+            female {{num_guests, plural, offset:1
                 =0    {{host} does not give a party.}
                 =1    {{host} invites {guest} to her party.}
                 =2    {{host} invites {guest} and one other person to her party.}
-                other {{host} invites {guest} and # other people to her party.}}
-            }
-            male {
-                {num_guests, plural, offset:1
+                other {{host} invites {guest} and # other people to her party.}
+            }}
+            male {{num_guests, plural, offset:1
                 =0    {{host} does not give a party.}
                 =1    {{host} invites {guest} to his party.}
                 =2    {{host} invites {guest} and one other person to his party.}
-                other {{host} invites {guest} and # other people to his party.}}
-            }
-            other {
-                {num_guests, plural, offset:1
+                other {{host} invites {guest} and # other people to his party.}
+            }}
+            other {{num_guests, plural, offset:1
                 =0    {{host} does not give a party.}
                 =1    {{host} invites {guest} to their party.}
                 =2    {{host} invites {guest} and one other person to their party.}
-                other {{host} invites {guest} and # other people to their party.}}
-            }
+                other {{host} invites {guest} and # other people to their party.}
+            }}
         }
 
 .. sidebar:: Using Ranges in Messages