On 05/29/2015 07:47 PM, sajolida wrote: > I'm not sure to understand your concern, but: my concern was, that the msgid and the msgstr are not 'in sync'.
normally, when there already exists a translation and then the msgid
changes, it is marked with the keyword 'fuzzy', so that the translators
can check and adjust the translation. in this case, the translation was
based on the 'old' msgid and then the msgid changed, but the translation
was still based on the old wording.
(iiuc git only show these types of conflict only as conflict in the
header, because in the header one specific line has been modified by two
commits. git doesn't know about the relationship between msgid and msgstr)
> [...]
> Is everything fine now? yes, thanks!
