Merge in the latest strings from zanata