svn://svn.zabbix.com/branches/dev/ZBX-2264
Use of undefined constant S_CUSER_LOGIN_OR_PASSWORD_INCORRECT - assumed 'S_CUSER_LOGIN_OR_PASSWORD_INCORRECT'[/usr/local/apache2/htdocs/dev/ZBX-2264/api/classes/class.cuser.php:415]
check now 
Use of undefined constant S_CUSER_ERROR_ATTEMP_FAILED - assumed 'S_CUSER_ERROR_ATTEMP_FAILED'[/usr/local/apache2/htdocs/dev/ZBX-2264/api/classes/class.cuser.php:501]
S_CUSER_ERROR_ATTEMP_FAILED
check again should be fine
newline was removed at the end of api/classes/class.cuser.php
when it's re-added, good to merge.
Easy tested. It works, but wanted to say, that the use of variables in the locale (en_gb.inc.php) can complicate the work of others translators.
Do not forget to remove commented block of code (no longer needed) in api/classes/class.cuser.php
thus :
1. newline must be re-added;
2. commented old code removed;
then can be merged 
In the https://support.zabbix.com/browse/ZBX-2132 Alexei Vladishev say that ".....all dates and time stamps used in Zabbix must be localized.....".
In these developments, this requirement is satisfied?
now 'config.inc' at least once contains hardcoded timestamp format.
Bug fixed in version pre 1.8.3 revision 11587
ChangeLog not updated for this improvement.
ChangeLog updated in version pre 1.8.3 revision 11605
svn head, attempting to view a restricted page while not logged in :
You cannot view this URL as a .
Object of class CTag could not be converted to string[/usr/local/apache2/htdocs/trunk/include/config.inc.php:260]
got broken in rev 11588
svn://svn.zabbix.com/branches/dev/ZBX-2264
confirming the fix in dev branch rev 11639.
Bug fixed in version pre 1.8.3 revision 11641