tr()-Fixes.

Change-Id: Ie4645f3a3c82d18099dd154293d242ab07b1e5fc
Reviewed-by: Christian Stenger <christian.stenger@digia.com>