Rsovled conflicts: po/es.po - all conflicts related to goffice strings were resolved in favor or the goffice translation - all other conflicts were resolved in favor of the TP po file