~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/plugins/po_merge/README

  • Committer: Patch Queue Manager
  • Date: 2016-04-21 04:39:02 UTC
  • mfrom: (6613.2.1 fix-gpl)
  • Revision ID: pqm@pqm.ubuntu.com-20160421043902-skyc5cmuqnh1b9la
(richard-wilbur) Update COPYING.txt from the original
 http://www.gnu.org/licenses/gpl-2.0.txt (Only differences were in
 whitespace.) Thanks to Petr Stodulka for pointing out the discrepancy.
 (Richard Wilbur)

Show diffs side-by-side

added added

removed removed

Lines of Context:
 
1
A plugin for merging .po files.
 
2
 
 
3
This plugin is controlled via configuration variables, see 'bzr help po_merge'.
 
4
 
 
5
This hook can avoid conflicts in ``.po` files by invoking msgmerge with the
 
6
appropriate options. If it can't apply, it falls back to the default bzr
 
7
merge algorithm.