[Scummvm-devel] Translation support was added to ScummVM

Andre Heider a.heider at gmail.com
Sun Jun 20 09:58:43 CEST 2010


On Sun, Jun 20, 2010 at 1:07 AM, Willem Jan Palenstijn <wjp at usecode.org> wrote:
> On Sat, Jun 19, 2010 at 08:33:41PM +0200, Johannes Schickel wrote:
>> Hi,
>>
>> just some slight update:
>>
>> I now removed the common/messages.cpp rule and the only way to update
>> that file is now "update-translations".
>>
>> I am not sure whether this is the best solution, but at least it should
>> remove all requirements on perl and gettext for build purposes.
>
> This thing with common/messages.cpp also seems to have confused buildbot. It
> looks like there's an svn conflict due to a generated file being in svn and it
> being updated?
>
> http://buildbot.scummvm.org/buildbot/builders/trunk-lenny-x86_64/builds/4723/steps/compile/logs/stdio

Yup, there was a conflict. That file was modified by the old make rules:

static struct _po2c_msg _po2c_lang_hu_HU[] = {
<<<<<<< .mine
    { 0, "Project-Id-Version: ScummVM VERSION\nReport-Msgid-Bugs-To:
scummvm-devel at lists.sf.net\nPOT-Creation-Date: 2010-06-17
20:57+0200\nPO-Revision-Date: 2009-11-25 07:42-0500\nLast-Translator:
Alex Bevilacqua <alexbevi at gmail.com>\nLanguage-Team:
Hungarian\nMIME-Version: 1.0\nContent-Type: text/plain;
charset=cp1250\nContent-Transfer-Encoding: 8bit\nLanguage:
\nPlural-Forms: nplurals=2; plural=(n != 1);\n" },
=======
    { 0, "Project-Id-Version: ScummVM VERSION\nReport-Msgid-Bugs-To:
scummvm-devel at lists.sf.net\nPOT-Creation-Date: 2010-06-19
22:36+0100\nPO-Revision-Date: 2009-11-25 07:42-0500\nLast-Translator:
Alex Bevilacqua <alexbevi at gmail.com>\nLanguage-Team:
Hungarian\nMIME-Version: 1.0\nContent-Type: text/plain;
charset=cp1250\nContent-Transfer-Encoding: 8bit\nLanguage:
\nPlural-Forms: nplurals=2; plural=(n != 1);\n" },
>>>>>>> .r50068

I just reverted the file, next compile run should be fine.

Johannes' changes should prevent this in the future.

Regards,
Andre




More information about the Scummvm-devel mailing list