2009-09-22 Jim Evins <evins@snaught.com>

2009-09-22  Jim Evins  <evins@snaught.com>

	* po/POTFILES.in:
		Include all (src/*.[ch]) source files.
	* data/builder/merge-properties-dialog.builder:
	* src/merge-properties-dialog.c: (gl_merge_properties_dialog_init),
	(gl_merge_properties_dialog_construct), (type_changed_cb):
		- OK button now has default focus.
		- Some formatting cleanup.

git-svn-id: https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@894 f5e0f49d-192f-0410-a22d-a8d8700d0965