Hi, The merge is done by the po_merge plugin.
http://doc.bazaar.canonical.com/beta/en/whats-new/whats-new-in-2.5.html #po-merge-plugin bzr-builddeb might be causing this to activate when using in bzr branches, but I don't think so. Do you have the config described in that link set on your machine? Thanks, James -- You received this bug notification because you are a member of Ubuntu Bugs, which is subscribed to Ubuntu. https://bugs.launchpad.net/bugs/1014802 Title: merge-upstream changes po files behind your back To manage notifications about this bug go to: https://bugs.launchpad.net/ubuntu/+source/bzr-builddeb/+bug/1014802/+subscriptions -- ubuntu-bugs mailing list ubuntu-bugs@lists.ubuntu.com https://lists.ubuntu.com/mailman/listinfo/ubuntu-bugs
