Make the po-merge tool overwrite translations from the source because the source is authorative, and also avoid updating the header.
Make the po-merge tool overwrite translations from the source because
the source is authorative, and also avoid updating the header.

* tools/dev/po-merge.py
  (main): Just do it, and rename a couple of local variables
  to improve code readability.


git-svn-id: f8a4e5e023278da1e04e203c7fe051e3c4285d88@851251 13f79535-47bb-0310-9956-ffa450edef68

YueLinHo/Subversion,wbond/subversion,wbond/subversion,YueLinHo/Subversion,YueLinHo/Subversion,wbond/subversion,wbond/subversion,YueLinHo/Subversion,wbond/subversion,wbond/subversion,wbond/subversion,YueLinHo/Subversion,YueLinHo/Subversion,YueLinHo/Subversion,YueLinHo/Subversion