<commit_before>/*
 * tree-conflicts.c: Tree conflicts.
 *
 * ====================================================================
 * Copyright (c) 2007-2008 CollabNet.  All rights reserved.
 *
 * This software is licensed as described in the file COPYING, which
 * you should have received as part of this distribution.  The terms
 * are also available at http://subversion.tigris.org/license-1.html.
 * If newer versions of this license are posted there, you may use a
 * newer version instead, at your option.
 *
 * This software consists of voluntary contributions made by many
 * individuals.  For exact contribution history, see the revision
 * history and logs, available at http://subversion.tigris.org/.
 * ====================================================================
 */

#include "tree-conflicts.h"
#include "svn_xml.h"
#include "svn_path.h"

#include "svn_private_config.h"


struct tree_conflict_phrases
{
  const char *update_deleted;
  const char *update_edited;
  const char *update_added;
  const char *switch_deleted;
  const char *switch_edited;
  const char *switch_added;
  const char *merge_deleted;
  const char *merge_edited;
  const char *merge_added;
  const char *we_deleted;
  const char *we_added;
  const char *we_edited_update;
  const char *missing_update;
  const char *we_edited_merge;
  const char *we_added_merge;
  const char *missing_merge;
  const char *obstructed;
  const char *unversioned;
};

/* Return a new (possibly localised)
 * tree_conflict_phrases object allocated in POOL. */
static struct tree_conflict_phrases *
new_tree_conflict_phrases(apr_pool_t *pool)
{
  struct tree_conflict_phrases *phrases =
    apr_pcalloc(pool, sizeof(struct tree_conflict_phrases));

  phrases->update_deleted = _(
    "  The update attempted to delete '%s'\n"
    "  (possibly as part of a rename operation).\n");

  phrases->update_edited = _(
    "  The update attempted to edit '%s'.\n");

  phrases->update_added = _(
    "  The update attempted to add '%s'.\n");

  phrases->switch_deleted = _(
    "  The switch attempted to delete '%s'\n"
    "  (possibly as part of a rename operation).\n");

  phrases->switch_edited = _(
    "  The switch attempted to edit '%s'.\n");

  phrases->switch_added = _(
    "  The switch attempted to add '%s'.\n");

  phrases->merge_deleted = _(
    "  The merge attempted to delete '%s'\n"
    "  (possibly as part of a rename operation).\n");

  phrases->merge_edited = _(
    "  The merge attempted to edit '%s'.\n");

  phrases->merge_added = _(
    "  The merge attempted to add '%s'.\n");

  phrases->we_deleted = _(
    "  You have deleted '%s' locally.\n"<commit_msg>* subversion/svn/tree-conflicts.c   (new_tree_conflict_phrases): Tweak tree conflict phrases so that    they do not have any parts in parentheses.    Hopefully this is easier to parse. (No, I did not consult a human    interface design expert prior to this change... If you know any,    please give me their number, I think we could use some external    help with the tree conflicts UI design.)<commit_after>/*
 * tree-conflicts.c: Tree conflicts.
 *
 * ====================================================================
 * Copyright (c) 2007-2008 CollabNet.  All rights reserved.
 *
 * This software is licensed as described in the file COPYING, which
 * you should have received as part of this distribution.  The terms
 * are also available at http://subversion.tigris.org/license-1.html.
 * If newer versions of this license are posted there, you may use a
 * newer version instead, at your option.
 *
 * This software consists of voluntary contributions made by many
 * individuals.  For exact contribution history, see the revision
 * history and logs, available at http://subversion.tigris.org/.
 * ====================================================================
 */

#include "tree-conflicts.h"
#include "svn_xml.h"
#include "svn_path.h"

#include "svn_private_config.h"


struct tree_conflict_phrases
{
  const char *update_deleted;
  const char *update_edited;
  const char *update_added;
  const char *switch_deleted;
  const char *switch_edited;
  const char *switch_added;
  const char *merge_deleted;
  const char *merge_edited;
  const char *merge_added;
  const char *we_deleted;
  const char *we_added;
  const char *we_edited_update;
  const char *missing_update;
  const char *we_edited_merge;
  const char *we_added_merge;
  const char *missing_merge;
  const char *obstructed;
  const char *unversioned;
};

/* Return a new (possibly localised)
 * tree_conflict_phrases object allocated in POOL. */
static struct tree_conflict_phrases *
new_tree_conflict_phrases(apr_pool_t *pool)
{
  struct tree_conflict_phrases *phrases =
    apr_pcalloc(pool, sizeof(struct tree_conflict_phrases));

  phrases->update_deleted = _(
    "  The update attempted to delete '%s',\n"
    "  or attempted to rename it.\n");

  phrases->update_edited = _(
    "  The update attempted to edit '%s'.\n");

  phrases->update_added = _(
    "  The update attempted to add '%s'.\n");

  phrases->switch_deleted = _(
    "  The switch attempted to delete '%s',\n"
    "  or attempted to rename it.\n");

  phrases->switch_edited = _(
    "  The switch attempted to edit '%s'.\n");

  phrases->switch_added = _(
    "  The switch attempted to add '%s'.\n");

  phrases->merge_deleted = _(
    "  The merge attempted to delete '%s',\n"
    "  or attempted to rename it.\n");

  phrases->merge_edited = _(
    "  The merge attempted to edit '%s'.\n");

  phrases->merge_added = _(
    "  The merge attempted to add '%s'.\n");

  phrases->we_deleted = _(
    "  You have deleted '%s' locally.\n"
{'fraction_non_alphanumeric': 0.14844995571302036, 'fraction_numerical': 0.0031886625332152346, 'mean_word_length': 3.8546861564918316, 'pattern_counts': {'":': 0, '<': 3, '<?xml version=': 0, '>': 23, 'https://': 0, 'lorem ipsum': 0, 'www.': 0, 'xml': 2}, 'pii_count': 0, 'substrings_counts': 0, 'word_list_counts': {'cursed_substrings.json': 0, 'profanity_word_list.json': 0, 'sexual_word_list.json': 0, 'zh_pornsignals.json': 0}}
{'dir': 'git-commits-cleaned', 'id': '6937030', 'n_tokens_mistral': 1763, 'n_tokens_neox': 1722, 'n_words': 562}