Make the conflict message "local %s %s, incoming %s %s upon %s"
translatable by constructing it from longer parts, each translated,
instead of single words (some of which were not translated at all).

* subversion/svn/cl-conflicts.c
  (svn_cl__get_human_readable_tree_conflict_description): Build string out
    of translated sub-phrases rather than from single words.
  (local_reason_str, incoming_action_str, operation_str): New functions.
  (map_conflict_action_human, map_conflict_reason_human,
   action_str, reason_str): Removed.

Patch by: Mattias Engdegård <mattiase@bredband.net>


git-svn-id: https://svn.apache.org/repos/asf/subversion/trunk@1465299 13f79535-47bb-0310-9956-ffa450edef68