Making agent param logic consistant

It doesn't make sense to create 2 tokens for the i18n message in one
case and only 1 token in another case. The current i18n messages are
designed to handle only 1 token for agent (for both grammar and display).

Change-Id: I7ab6b5a7b6731e60d0ea6e9e590c15039fdc4459
Merge "Making agent param logic consistant"
Localisation updates from http://translatewiki.net.

Change-Id: I68d86c3be0138529629c21784c987520af7ec2f2