Fixed parameter for user city.

Previously the user's city parameter is defined to use the 'locality'
attribute. This was a problem because the attribute would be returned
as 'l' by the directory server causing a mismatch. Now the parameter
has been changed to use the 'l' attribute.

ipalib/plugins/user.py

@@ -179,13 +179,13 @@ class user(LDAPObject):
             cli_name='street',
             label=_('Street address'),
         ),
-        Str('locality?',
+        Str('l?',
             cli_name='city',
             label=_('City'),
         ),
         Str('st?',
             cli_name='state',
-            label=_('State'),
+            label=_('State/Province'),
         ),
         Int('postalcode?',
             label=_('ZIP'),