[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Re: svn commit: r33792 - in trunk/subversion: libsvn_wc svn

From: Greg Stein <gstein_at_gmail.com>
Date: Tue, 21 Oct 2008 01:28:05 -0700

Is there a way to mark the strings as "We made a conscious decision to
not translate these" ? ... I fear that in a year or so, somebody will
come along, notice they done have _() around them, and *add* it back.

On Mon, Oct 20, 2008 at 5:54 PM, <neels_at_tigris.org> wrote:
> Author: neels
> Date: Mon Oct 20 17:54:35 2008
> New Revision: 33792
>
> Log:
> Making two fatal errors non-translatable. They only occur in the presence
> of a corrupt working copy.
>
> Suggested by: jensseidel
>
> * subversion/svn/tree-conflicts.c
> (svn_cl__append_human_readable_tree_conflict_description): Remove a _().
>
> * subversion/libsvn_wc/tree_conflicts.c
> (svn_wc__write_tree_conflicts_to_entry): Remove a _().
>
> Modified:
> trunk/subversion/libsvn_wc/tree_conflicts.c
> trunk/subversion/svn/tree-conflicts.c
>
> Modified: trunk/subversion/libsvn_wc/tree_conflicts.c
> URL: http://svn.collab.net/viewvc/svn/trunk/subversion/libsvn_wc/tree_conflicts.c?pathrev=33792&r1=33791&r2=33792
> ==============================================================================
> --- trunk/subversion/libsvn_wc/tree_conflicts.c Mon Oct 20 16:17:50 2008 (r33791)
> +++ trunk/subversion/libsvn_wc/tree_conflicts.c Mon Oct 20 17:54:35 2008 (r33792)
> @@ -354,7 +354,7 @@ svn_wc__write_tree_conflicts_to_entry(ap
> len = strlen(path);
> if (len == 0)
> return svn_error_create(SVN_ERR_WC_CORRUPT, NULL,
> - _("Empty victim path in tree conflict description"));
> + "Empty victim path in tree conflict description");
>
> /* Escape separator chars while writing victim path. */
> for (j = 0; j < len; j++)
>
> Modified: trunk/subversion/svn/tree-conflicts.c
> URL: http://svn.collab.net/viewvc/svn/trunk/subversion/svn/tree-conflicts.c?pathrev=33792&r1=33791&r2=33792
> ==============================================================================
> --- trunk/subversion/svn/tree-conflicts.c Mon Oct 20 16:17:50 2008 (r33791)
> +++ trunk/subversion/svn/tree-conflicts.c Mon Oct 20 17:54:35 2008 (r33792)
> @@ -239,7 +239,7 @@ svn_cl__append_human_readable_tree_confl
> our_phrase = select_our_phrase(conflict, phrases);
> if (! our_phrase || ! their_phrase)
> return svn_error_createf(SVN_ERR_WC_CORRUPT, NULL,
> - _("Invalid tree conflict data for victim %s"),
> + "Invalid tree conflict data for victim %s",
> victim_name);
>
> /* Substitute the '%s' format in the phrases with the victim path. */
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: svn-unsubscribe_at_subversion.tigris.org
> For additional commands, e-mail: svn-help_at_subversion.tigris.org
>
>

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe_at_subversion.tigris.org
For additional commands, e-mail: dev-help_at_subversion.tigris.org
Received on 2008-10-21 10:28:19 CEST

This is an archived mail posted to the Subversion Dev mailing list.