replace String != operation with .equals

replaced the != operation performed on two String objects with ObjectUtils.equals

Signed-off-by: Laszlo Hornyak <laszlo.hornyak@gmail.com>
Fixed some resource files issues, namely 1) invalid text and duplicate keys resulting from bad merge and 2) trailing spaces which can potentially cause UI issues.

Signed-off-by: Konstantina Chremmou <konstantina.chremmou@citrix.com>
Reviewed-by: Laszlo Hornyak <laszlo.hornyak@gmail.com>