intltool r712 - trunk

[dobey svn gnome org]

Author: dobey
Date: 2007-12-17 04:27:24 +0000 (Mon, 17 Dec 2007)
New Revision: 712
ViewCVS link: http://svn.gnome.org/viewcvs/intltool?rev=712&view=rev

Modified:
   trunk/ChangeLog
   trunk/intltool-merge.in.in
Log:
2007-12-16  Rodney Dawes  <dobey pwns gmail com>

	* intltool-merge.in.in (keys_merge_translation):
	New method name for merging a single translation for multi-output
	(keys_merge_translations):
	Call keys_merge_translation for each language with multi-ouput
	Call keys_merge_translation with "." as the language for single file

	Based on patch from Christian Persch <chpe gnome org>

	Fixes #487818