Patch proposal to fix 359077

Hello,
I had provided a cvs patch with bug 359077 in order to support i18n with RAP GEF port, outdated since the project has moved to git, this pull request is a replacement.
In the pull request there is 2 commits, one as a fix proposal, the other is necessary in order to fix compilation issue with latest rap 2.0 changes