Re: [Gretl-users] Getting ready for 1.5.1
Allin Cottrell schrieb:
Hello translators: I think most of you are now using direct access
to
gretl CVS, but I have just sent an updated gretl.pot file to IRO in
preparation for the gretl 1.5.1 release.
I won't add or change any more translatable strings at this point.
While I was working on de.po (sort of offline), the cvs-version changed,
and when I updated my local tree, the cvs-client indicated a conflict.
Should I have committed before trying another update? And what do I do
now to resolve the conflict and merge my changes?
thanks for your help,
sven