[Gambas-user] Request to merge translations

[Gianluigi]

Il 13/02/24 10:19, Gianluigi ha scritto:
> Il 13/02/24 09:54, Benoît Minisini ha scritto:
>> Le 12/02/2024 à 15:07, Benoît Minisini a écrit :
>>> Le 12/02/2024 à 08:49, Gianluigi a écrit :
>>>> Benoit,
>>>>
>>>> I see you didn't merge the Italian translations.
>>>> Any problems?
>>>>
>>>> Regards
>>>> Gianluigi
>>>>
>>>
>>> I was not available this week-end, so I didn't have time to look at
>>> the merge request yet.
>>>
>>> Regards,
>>>
>>
>>
>> I just merged your merge request, but I think it was broken, as there
>> are no apparent change inside. Can you check that?
>>
> Hi Benoit,
>
> you're right, I obviously did something wrong in conflict resolution.
>
> Today I redo the translations and try to redo the union.
>
> Sorry for the inconvenience, thanks and regards
> Gianluigi
>
>
> ----[ http://gambaswiki.org/wiki/doc/netiquette ]----

Hi Benoit,

I saw that you deleted the branc gambas-master at me, do I need to give
any special command?
Now if I try to update gambas (git pull upstream master) I get error.
If I open gambas in the IDE now I don't see gb.highlight (see image) and
for the wiki I get this error (see image).
Any suggestions?

Thank you and regards
Gianluigi
-------------- next part --------------
A non-text attachment was scrubbed...
Name: compiler error.png
Type: image/png
Size: 13742 bytes
Desc: not available
URL: <http://lists.gambas-basic.org/pipermail/user/attachments/20240213/7d26614a/attachment-0002.png>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: gb.highlight.png
Type: image/png
Size: 57716 bytes
Desc: not available
URL: <http://lists.gambas-basic.org/pipermail/user/attachments/20240213/7d26614a/attachment-0003.png>