Thank you for fixing this, Evan! The MP looks very good. :)
@Stefano: You make a really good point with (1). Let's keep that in mind when we continue to add features. :)
[Another note regarding pot file conflicts: If you have already committed stuff which causes a merge conflict, you can revert the po directory to the state which it was in before your first commit using
bzr revert -r 151 po/
where 151 is the revision before your first commit. That will also be handy sometimes. ;) ]
Thank you for fixing this, Evan! The MP looks very good. :)
@Stefano: You make a really good point with (1). Let's keep that in mind when we continue to add features. :)
[Another note regarding pot file conflicts: If you have already committed stuff which causes a merge conflict, you can revert the po directory to the state which it was in before your first commit using
bzr revert -r 151 po/
where 151 is the revision before your first commit. That will also be handy sometimes. ;) ]
Let's merge the MP now!