git-gui i18n status?

Now that git-gui 0.8.2 is out and git 1.5.3 is just around the corner I am starting to think about bringing the git-gui i18n work into the main git-gui tree, so we can start working from a common codebase.

Looking at the repository on repo.or.cz it looks like it needs to be merged/rebased onto 0.8.2. There is a trivial merge conflict, but there are some more subtle ones caused by the movement of the library directory initialization down lower in git-gui.sh. For example translations won't be initialized if we have an issue with the output of git-version and want to prompt the user.

What is the current plan? Should I be looking at the master branch of git://repo.or.cz/git-gui/git-gui-i18n.git for pulling? Or are folks expecting that this series will be cleaned up before I pull it?