[z3-five] Re: Branch status: i18n-branch and local site manager branch.

[Philipp von Weitershausen]

Lennart Regebro wrote:
> I'd like to merge in the i18n-branch and the local site manager
> branch, so we can release a new version of Five. I am currently
> happily using 1.0.1, but I'd like to get i18n working.

I am in the middle of writing i18n tests. Before these arent' there we 
can't merge. Also, I remember that Martijn expressed that he wanted to 
take some time to review the code in the i18n branch...

> However, I noticed there are TWO i18n branches now.... Which is the
> correct one?

The philikon-i18n branch is off of the 1.0 branch, the philikon-i18n-2 
branch is off of the trunk and the more current one. It is also the one 
I'm writing unit tests for and it's the one that I will merge to the trunk.

Philipp