en to nb translation catalogue (4 entries)

en: Custom Patch
nb: Tilpasset lapp

en: <b><span style="color:red">Conflict</span></b><br/>
nb: <b><span style="color:red">Konflikt</span></b><br/>

en: Could not apply the change: Text should be "%1", but is "%2".
nb: Klarte ikke anvende endringen: Teksten skulle være «%1», men er "%2".

[ctx: %1: number of changed hunks, %2: file name]
en: %2 (1 hunk) | %2 (%1 hunks)
nb[0]: %2 (1 klump)
nb[1]: %2 (%1 klumper)
