Greek translation - messages.po & merge issues fix