Quoting Jeroen Schot (sc...@a-eskwadraat.nl):
> #. Type: error
> #. Description
> #: ../templates:6001
> msgid ""
> "Conflicts found during three-way merge! Please edit `${dest_file}' and sort "
> "them out manually."
> msgstr ""
> "Conflicten gevonden tijdens de drievoudige samenvoeging! Wijzig alstublieft
> `"
> "{$dest_file}` handmatig om dit op te lossen."
The ${dest_file} variable is incorrectly written, here.
Fixed file attached.
nl.po
Description: application/gettext
signature.asc
Description: Digital signature
