* subversion/svn/conflict-callbacks.c   (show_conflicts): Mark some messages for translation.
* subversion/svn/conflict-callbacks.c
  (show_conflicts): Mark some messages for translation.

jmckaskill/subversion,jmckaskill/subversion,jmckaskill/subversion,jmckaskill/subversion,jmckaskill/subversion,jmckaskill/subversion,jmckaskill/subversion,jmckaskill/subversion