synchronizing po file of branch and trunk

[Scott Kostyshak]

I thought I just needed to overwrite the trunk po files with the branch
po files, but it seems there are changes in the trunk po files that are
not in branch (e.g. a73c2647). So what is the procedure for this?

Scott