You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by ka...@apache.org on 2010/12/31 15:24:13 UTC
svn commit: r1054115 - in /subversion/trunk/subversion: libsvn_client/
libsvn_ra_neon/ libsvn_ra_serf/ libsvn_subr/ svn/ svnlook/
Author: kameshj
Date: Fri Dec 31 14:24:13 2010
New Revision: 1054115
URL: http://svn.apache.org/viewvc?rev=1054115&view=rev
Log:
Prefix an underscore to the error messages to make it visible to the
translator.
* subversion/libsvn_subr/auth.c
* subversion/svn/util.c
* subversion/svn/propget-cmd.c
* subversion/libsvn_client/delete.c
* subversion/libsvn_client/repos_diff.c
* subversion/svnlook/main.c
* subversion/libsvn_ra_serf/auth_digest.c
* subversion/libsvn_ra_serf/auth.c
* subversion/libsvn_ra_serf/util.c
* subversion/libsvn_ra_serf/win32_auth_sspi.c
* subversion/libsvn_ra_serf/commit.c
* subversion/libsvn_ra_neon/util.c
Patch by: Vijayaguru G <vijay{_AT_}collab.net>
Suggested by: kameshj
Tweaked by: kameshj
Modified:
subversion/trunk/subversion/libsvn_client/delete.c
subversion/trunk/subversion/libsvn_client/repos_diff.c
subversion/trunk/subversion/libsvn_ra_neon/util.c
subversion/trunk/subversion/libsvn_ra_serf/auth.c
subversion/trunk/subversion/libsvn_ra_serf/auth_digest.c
subversion/trunk/subversion/libsvn_ra_serf/commit.c
subversion/trunk/subversion/libsvn_ra_serf/util.c
subversion/trunk/subversion/libsvn_ra_serf/win32_auth_sspi.c
subversion/trunk/subversion/libsvn_subr/auth.c
subversion/trunk/subversion/svn/propget-cmd.c
subversion/trunk/subversion/svn/util.c
subversion/trunk/subversion/svnlook/main.c
Modified: subversion/trunk/subversion/libsvn_client/delete.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_client/delete.c?rev=1054115&r1=1054114&r2=1054115&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/delete.c (original)
+++ subversion/trunk/subversion/libsvn_client/delete.c Fri Dec 31 14:24:13 2010
@@ -230,7 +230,7 @@ delete_urls(const apr_array_header_t *pa
&kind, subpool));
if (kind == svn_node_none)
return svn_error_createf(SVN_ERR_FS_NOT_FOUND, NULL,
- "URL '%s' does not exist", item_url);
+ _("URL '%s' does not exist"), item_url);
}
svn_pool_destroy(subpool);
Modified: subversion/trunk/subversion/libsvn_client/repos_diff.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_client/repos_diff.c?rev=1054115&r1=1054114&r2=1054115&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/repos_diff.c (original)
+++ subversion/trunk/subversion/libsvn_client/repos_diff.c Fri Dec 31 14:24:13 2010
@@ -39,6 +39,7 @@
#include "svn_path.h"
#include "svn_io.h"
#include "svn_props.h"
+#include "svn_private_config.h"
#include "client.h"
@@ -375,7 +376,7 @@ get_dir_abspath(const char **local_dir_a
*local_dir_abspath = local_abspath;
else if (!lenient)
return svn_error_createf(SVN_ERR_WC_NOT_WORKING_COPY, NULL,
- "'%s' is not a versioned directory",
+ _("'%s' is not a versioned directory"),
svn_dirent_local_style(local_abspath, pool));
}
Modified: subversion/trunk/subversion/libsvn_ra_neon/util.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_ra_neon/util.c?rev=1054115&r1=1054114&r2=1054115&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_ra_neon/util.c (original)
+++ subversion/trunk/subversion/libsvn_ra_neon/util.c Fri Dec 31 14:24:13 2010
@@ -651,7 +651,7 @@ generate_error(svn_ra_neon__request_t *r
/*### This is a translation nightmare. Make sure to compose full strings
and mark those for translation. */
- return svn_error_createf(errcode, NULL, "%s: %s (%s://%s)",
+ return svn_error_createf(errcode, NULL, _("%s: %s (%s://%s)"),
context, msg, ne_get_scheme(req->ne_sess),
hostport);
}
@@ -771,7 +771,7 @@ start_err_element(void *baton, int paren
overwritten by the <human-readable> tag, or even someday by
a <D:failed-precondition/> tag. */
*err = svn_error_create(APR_EGENERAL, NULL,
- "General svn error from server");
+ _("General svn error from server"));
break;
}
case ELEM_human_readable:
Modified: subversion/trunk/subversion/libsvn_ra_serf/auth.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_ra_serf/auth.c?rev=1054115&r1=1054114&r2=1054115&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_ra_serf/auth.c (original)
+++ subversion/trunk/subversion/libsvn_ra_serf/auth.c Fri Dec 31 14:24:13 2010
@@ -335,7 +335,7 @@ svn_ra_serf__handle_auth(int code,
{
if (session->auth_protocol)
return svn_error_createf(SVN_ERR_AUTHN_FAILED, NULL,
- "%s Authentication failed",
+ _("%s Authentication failed"),
session->auth_protocol->auth_name);
else
return svn_error_create(SVN_ERR_AUTHN_FAILED, NULL, NULL);
@@ -359,8 +359,8 @@ svn_ra_serf__handle_auth(int code,
{
/* Support more authentication mechanisms. */
return svn_error_createf(SVN_ERR_AUTHN_FAILED, NULL,
- "%s authentication not supported.\n"
- "Authentication failed",
+ _("%s authentication not supported.\n"
+ "Authentication failed"),
ab.last_prot_name
? ab.last_prot_name
: "Unknown");
@@ -461,8 +461,8 @@ handle_basic_auth(svn_ra_serf__handler_t
{
/* No more credentials. */
return svn_error_create(SVN_ERR_AUTHN_FAILED, NULL,
- "No more credentials or we tried too many times.\n"
- "Authentication failed");
+ _("No more credentials or we tried too many times.\n"
+ "Authentication failed"));
}
simple_creds = creds;
@@ -537,7 +537,7 @@ handle_proxy_basic_auth(svn_ra_serf__han
{
/* No more credentials. */
return svn_error_create(SVN_ERR_AUTHN_FAILED, NULL,
- "Proxy authentication failed");
+ _("Proxy authentication failed"));
}
svn_ra_serf__encode_auth_header(session->proxy_auth_protocol->auth_name,
Modified: subversion/trunk/subversion/libsvn_ra_serf/auth_digest.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_ra_serf/auth_digest.c?rev=1054115&r1=1054114&r2=1054115&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_ra_serf/auth_digest.c (original)
+++ subversion/trunk/subversion/libsvn_ra_serf/auth_digest.c Fri Dec 31 14:24:13 2010
@@ -311,8 +311,8 @@ svn_ra_serf__handle_digest_auth(svn_ra_s
{
/* No more credentials. */
return svn_error_create(SVN_ERR_AUTHN_FAILED, NULL,
- "No more credentials or we tried too many times.\n"
- "Authentication failed");
+ _("No more credentials or we tried too many times.\n"
+ "Authentication failed"));
}
simple_creds = creds;
Modified: subversion/trunk/subversion/libsvn_ra_serf/commit.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_ra_serf/commit.c?rev=1054115&r1=1054114&r2=1054115&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_ra_serf/commit.c (original)
+++ subversion/trunk/subversion/libsvn_ra_serf/commit.c Fri Dec 31 14:24:13 2010
@@ -230,7 +230,7 @@ return_response_err(svn_ra_serf__handler
err = svn_error_compose_create(
ctx->server_error.error,
svn_error_createf(SVN_ERR_RA_DAV_REQUEST_FAILED, NULL,
- "%s of '%s': %d %s",
+ _("%s of '%s': %d %s"),
handler->method, handler->path,
ctx->status, ctx->reason));
Modified: subversion/trunk/subversion/libsvn_ra_serf/util.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_ra_serf/util.c?rev=1054115&r1=1054114&r2=1054115&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_ra_serf/util.c (original)
+++ subversion/trunk/subversion/libsvn_ra_serf/util.c Fri Dec 31 14:24:13 2010
@@ -963,12 +963,12 @@ parse_dav_status(int *status_code_out, s
token = apr_strtok(NULL, " \t\r\n", &tok_status);
if (!token)
return svn_error_createf(SVN_ERR_RA_DAV_MALFORMED_DATA, NULL,
- "Malformed DAV:status CDATA '%s'",
+ _("Malformed DAV:status CDATA '%s'"),
buf->data);
err = svn_cstring_atoi(status_code_out, token);
if (err)
return svn_error_createf(SVN_ERR_RA_DAV_MALFORMED_DATA, err,
- "Malformed DAV:status CDATA '%s'",
+ _("Malformed DAV:status CDATA '%s'"),
buf->data);
return SVN_NO_ERROR;
@@ -1294,8 +1294,8 @@ svn_ra_serf__handle_xml_parser(serf_requ
}
}
SVN_ERR(svn_error_createf(SVN_ERR_RA_DAV_MALFORMED_DATA, NULL,
- "XML parsing failed: (%d %s)",
- sl.code, sl.reason));
+ _("XML parsing failed: (%d %s)"),
+ sl.code, sl.reason));
}
if (ctx->error && ctx->ignore_errors == FALSE)
Modified: subversion/trunk/subversion/libsvn_ra_serf/win32_auth_sspi.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_ra_serf/win32_auth_sspi.c?rev=1054115&r1=1054114&r2=1054115&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_ra_serf/win32_auth_sspi.c (original)
+++ subversion/trunk/subversion/libsvn_ra_serf/win32_auth_sspi.c Fri Dec 31 14:24:13 2010
@@ -98,7 +98,7 @@ initialize_sspi(void *baton, apr_pool_t*
return svn_error_createf
(SVN_ERR_RA_SERF_SSPI_INITIALISATION_FAILED, NULL,
- "SSPI Initialization failed.");
+ _("SSPI Initialization failed."));
}
/* Calculates the maximum token size based on the authentication protocol. */
@@ -121,7 +121,7 @@ sspi_maxtokensize(const char *auth_pkg,
else
return svn_error_createf
(SVN_ERR_RA_SERF_SSPI_INITIALISATION_FAILED, NULL,
- "SSPI Initialization failed.");
+ _("SSPI Initialization failed.");
return SVN_NO_ERROR;
}
@@ -291,7 +291,7 @@ sspi_get_credentials(char *token, apr_si
if (status != SEC_E_OK)
return svn_error_createf
(SVN_ERR_RA_SERF_SSPI_INITIALISATION_FAILED, NULL,
- "SSPI Initialization failed.");
+ _("SSPI Initialization failed."));
status = sspi->InitializeSecurityContext(&creds,
ctx != NULL && ctx->dwLower != 0
@@ -336,7 +336,7 @@ sspi_get_credentials(char *token, apr_si
default:
return svn_error_createf(SVN_ERR_AUTHN_FAILED, NULL,
- "Authentication failed with error 0x%x.", status);
+ _("Authentication failed with error 0x%x."), status);
}
return SVN_NO_ERROR;
Modified: subversion/trunk/subversion/libsvn_subr/auth.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_subr/auth.c?rev=1054115&r1=1054114&r2=1054115&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_subr/auth.c (original)
+++ subversion/trunk/subversion/libsvn_subr/auth.c Fri Dec 31 14:24:13 2010
@@ -183,7 +183,7 @@ svn_auth_first_credentials(void **creden
table = apr_hash_get(auth_baton->tables, cred_kind, APR_HASH_KEY_STRING);
if (! table)
return svn_error_createf(SVN_ERR_AUTHN_NO_PROVIDER, NULL,
- "No provider registered for '%s' credentials",
+ _("No provider registered for '%s' credentials"),
cred_kind);
/* First, see if we have cached creds in the auth_baton. */
Modified: subversion/trunk/subversion/svn/propget-cmd.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/svn/propget-cmd.c?rev=1054115&r1=1054114&r2=1054115&view=diff
==============================================================================
--- subversion/trunk/subversion/svn/propget-cmd.c (original)
+++ subversion/trunk/subversion/svn/propget-cmd.c Fri Dec 31 14:24:13 2010
@@ -61,7 +61,7 @@ stream_write(svn_stream_t *out,
SVN_ERR(svn_stream_write(out, data, &write_len));
if (write_len != len)
return svn_error_create(SVN_ERR_STREAM_UNEXPECTED_EOF, NULL,
- "Error writing to stream");
+ _("Error writing to stream"));
return SVN_NO_ERROR;
}
Modified: subversion/trunk/subversion/svn/util.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/svn/util.c?rev=1054115&r1=1054114&r2=1054115&view=diff
==============================================================================
--- subversion/trunk/subversion/svn/util.c (original)
+++ subversion/trunk/subversion/svn/util.c Fri Dec 31 14:24:13 2010
@@ -623,7 +623,7 @@ svn_cl__cleanup_log_msg(void *log_msg_ba
commit error chain, too. */
err = svn_error_createf(commit_err->apr_err, NULL,
- " '%s'",
+ _(" '%s'"),
svn_dirent_local_style(lmb->tmpfile_left, pool));
svn_error_compose(commit_err,
svn_error_create(commit_err->apr_err, err,
Modified: subversion/trunk/subversion/svnlook/main.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/svnlook/main.c?rev=1054115&r1=1054114&r2=1054115&view=diff
==============================================================================
--- subversion/trunk/subversion/svnlook/main.c (original)
+++ subversion/trunk/subversion/svnlook/main.c Fri Dec 31 14:24:13 2010
@@ -1571,7 +1571,7 @@ print_history(void *baton,
if (phb->count >= phb->limit)
/* Not L10N'd, since this error is supressed by the caller. */
return svn_error_create(SVN_ERR_CEASE_INVOCATION, NULL,
- "History item limit reached");
+ _("History item limit reached"));
}
return SVN_NO_ERROR;