Merge user-l10n-functions.php and user-l10n.php into user.php

git-svn-id: https://plugins.svn.wordpress.org/bogo/trunk@926015 b8457f37-d9ea-0310-8a92-e5e31aec5664