> What I see, though, is that you moved some of the new strings for the OSD notifications to different files...
Moving the strings from one file to another should be alright as long as the new files are included in POTFILES.in, which they are.
> I also see you changed a couple of strings (from Usb to USB).
Agreed, that's bad timing.
Reverted r639.
> I´m not approving yet, as it still has those weird conflicts and it´s a bit hard to read
Working on the conflicts now. I hope you meant that's why it's hard to read ;)
« Back to merge proposal
> What I see, though, is that you moved some of the new strings for the OSD notifications to different files...
Moving the strings from one file to another should be alright as long as the new files are included in POTFILES.in, which they are.
> I also see you changed a couple of strings (from Usb to USB).
Agreed, that's bad timing.
Reverted r639.
> I´m not approving yet, as it still has those weird conflicts and it´s a bit hard to read
Working on the conflicts now. I hope you meant that's why it's hard to read ;)