make dist fails on translations

[Jens Finke <jens triq net>]

Hi,

I am trying to package a new release of eog and it fails making the *.gmo 
translation files. Here is what it prints out:

catalogs='az.gmo ar.gmo be.gmo bg.gmo ca.gmo cs.gmo da.gmo de.gmo el.gmo 
es.gmo et.gmo fi.gmo fr.gmo ga.gmo gl.gmo he.gmo hu.gmo it.gmo ja.gmo 
ko.gmo lt.gmo lv.gmo ms.gmo nl.gmo nn.gmo no.gmo pl.gmo pt.gmo pt_BR.gmo 
ro.gmo ru.gmo sl.gmo sk.gmo sq.gmo sv.gmo ta.gmo tr.gmo uk.gmo vi.gmo 
wa.gmo zh_CN.gmo zh_TW.gmo'; \
for cat in $catalogs; do \
  cat=`basename $cat`; \
  lang=`echo $cat | sed 's/\.gmo$//'`; \
  cp $lang.po $lang.old.po; \
  echo "$lang:"; \
  if msgmerge $lang; then \
    rm -f $lang.old.po; \
  else \
    echo "msgmerge for $cat failed!"; \
    rm -f $lang.po; \
    mv $lang.old.po $lang.po; \
  fi; \
done
az:
msgmerge: exactly 2 input files required
Try `msgmerge --help' for more information.
msgmerge for az.gmo failed!
ar:
msgmerge: exactly 2 input files required
Try `msgmerge --help' for more information.
msgmerge for ar.gmo failed!
...

During autogen.sh I also get this message, which may be related to this:

...
Running intltoolize...
patching file po/Makefile.in.in
Hunk #1 succeeded at 21 (offset 7 lines).
Hunk #2 FAILED at 46.
Hunk #3 succeeded at 88 with fuzz 2 (offset -4 lines).
Hunk #4 succeeded at 207 (offset -11 lines).
Hunk #5 succeeded at 225 (offset -4 lines).
1 out of 5 hunks FAILED -- saving rejects to file po/Makefile.in.in.rej
...

I have gettext 0.11.5 and Garnome 0.19.5 installed which provides intltool
0.24. Does anybody have a solution here? Thanks.

Best wishes,

   Jens