* thunar-vfs/thunar-vfs-io-jobs.c, thunar-vfs/thunar-vfs-job.{c,h},
	  thunar-vfs/thunar-vfs-job-private.h, thunar/thunar-dialogs.c,
	  thunar-vfs/thunar-vfs-transfer-job.c: Add support to retry job
	  based operations.
	* thunar-vfs/thunar-vfs-job-private.h, thunar-vfs-job.{c,h},
	  thunar-vfs/thunar-vfs-transfer-job.c, thunar/thunar-dialogs.{c,h},
	  thunar/thunar-progress-dialog.c, thunar-vfs/thunar-vfs-marshal.list:
	  Display more details when asking the user whether to replace an
	  existing file with another file. Bug #3268.
	* po/tr.po: Revert broken file.
	* po/*.po, po/*.pot: Merge new strings.
	* po/de.po: Update german translations.




(Old svn revision: 25750)