What I see, though, is that you moved some of the new strings for the OSD notifications to different files...
I don´t know if that´s going to be a problem with the translations if we don´t land this today.
I also see you changed a couple of strings (from Usb to USB).
I´m not approving yet, as it still has those weird conflicts and it´s a bit hard to read, but overall it looks good to me :)
It looks better than the initial approach.
What I see, though, is that you moved some of the new strings for the OSD notifications to different files...
I don´t know if that´s going to be a problem with the translations if we don´t land this today.
I also see you changed a couple of strings (from Usb to USB).
I´m not approving yet, as it still has those weird conflicts and it´s a bit hard to read, but overall it looks good to me :)