Rev 6294: Better fix README, add 'debian/po' to the 'po_merge.po_dirs' default value. in file:///home/vila/src/bzr/bugs/884270-merge-po/

[Vincent Ladeuil]

At file:///home/vila/src/bzr/bugs/884270-merge-po/

------------------------------------------------------------
revno: 6294
revision-id: v.ladeuil+lp at free.fr-20111129101356-g3iz91m627wgf2ze
parent: v.ladeuil+lp at free.fr-20111129085609-ze6f5twl6kakdnkv
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: 884270-merge-po
timestamp: Tue 2011-11-29 11:13:56 +0100
message:
  Better fix README, add 'debian/po' to the 'po_merge.po_dirs' default value.
-------------- next part --------------
=== modified file 'bzrlib/plugins/po_merge/README'
--- a/bzrlib/plugins/po_merge/README	2011-11-29 08:56:09 +0000
+++ b/bzrlib/plugins/po_merge/README	2011-11-29 10:13:56 +0000
@@ -1,6 +1,6 @@
 A plugin for merging .po files.
 
-This plugin is activated via configuration variables, see 'bzr help po_merge'.
+This plugin is controlled via configuration variables, see 'bzr help po_merge'.
 
 This hook can avoid conflicts in ``.po` files by invoking msgmerge with the
 appropriate options. If it can't apply, it falls back to the default bzr

=== modified file 'bzrlib/plugins/po_merge/po_merge.py'
--- a/bzrlib/plugins/po_merge/po_merge.py	2011-11-29 08:44:27 +0000
+++ b/bzrlib/plugins/po_merge/po_merge.py	2011-11-29 10:13:56 +0000
@@ -58,7 +58,7 @@
 
 
 config.option_registry.register(config.Option(
-        'po_merge.po_dirs', default='po,',
+        'po_merge.po_dirs', default='po,debian/po',
         from_unicode=config.list_from_store,
         help='List of dirs containing .po files that the hook applies to.'))