Add a new development tool to merge strings from one po file to another to be used when merging translations from trunk to branches.
Add a new development tool to merge strings from one po file to another
to be used when merging translations from trunk to branches.

* tools/dev/po-merge.py: New file.

jmckaskill/subversion,jmckaskill/subversion,jmckaskill/subversion,jmckaskill/subversion,jmckaskill/subversion,jmckaskill/subversion,jmckaskill/subversion,jmckaskill/subversion