On Sat, May 07, 2016 at 11:16:50AM +0200, Georg Baum wrote: > Scott Kostyshak wrote: > > > On Thu, May 05, 2016 at 02:32:46PM +0200, Georg Baum wrote: > >> > >> I would like to merge all changes to mergepo.py from 2.3-staging to > >> master (see attached). The users won't see this script at all, but it > >> will make updating translations easier, especially since most translators > >> work on the rc1 .po files that have been generated before the latest > >> remerge (which caused a resorting of entries). > > > > OK go ahead. > > Done. Now I would recommend to merge all .po file contributions that are not > based on the latest remerge by > > python development/tools/mergepo.py -o -l xx -t po /tmp/ > > wher xx is the language to be merged, and the contributed xx.po files is in > the directory /tmp/. The script does not update the header lines, so these > have to be merged manually for now.
OK go ahead. Scott
signature.asc
Description: PGP signature
