Problems merging stable to gui-release

[John W. Eaton]

When I try to merge stable to gui-release, I get a number of conflicts 
due to line numbers being different in the translation files.

What's the right way to handle these conflicts?  I suppose line number 
differences should be ignored but I don't want to ignore content changes 
if they apply to both stable and gui-release.

jwe