Hi,
Attaching the patch that prefixes an underscore with the error messages
to make it visible to translators.
I could see the error messages in mod_dav_svn are not prefixed by an
underscore, may be the subsequent layers will handle the errors and
translate it?
Thanks & Regards,
Vijayaguru
[[[
Prefix an underscore to the error messages to make it visible to the
translator.
* subversion/libsvn_subr/subst.c,
subversion/libsvn_subr/config_file.c,
subversion/libsvn_subr/auth.c,
subversion/libsvn_subr/stream.c,
subversion/libsvn_subr/config_win.c,
subversion/svn/util.c,
subversion/svn/propget-cmd.c,
subversion/libsvn_fs_base/bdb/strings-table.c,
subversion/libsvn_fs_base/bdb/env.c,
subversion/libsvn_fs_base/bdb/rev-table.c,
subversion/libsvn_fs_base/lock.c,
subversion/libsvn_fs_base/util/fs_skels.c,
subversion/svnlook/main.c,
subversion/libsvn_client/delete.c,
subversion/libsvn_client/repos_diff.c,
subversion/libsvn_ra_neon/util.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_repos/fs-wrap.c,
subversion/libsvn_repos/commit.c,
subversion/libsvn_repos/delta.c,
subversion/libsvn_repos/authz.c,
subversion/svnserve/serve.c,
subversion/libsvn_fs_fs/fs_fs.c,
subversion/libsvn_fs_fs/dag.c:
Make error messages visible to translator.
Patch by: Vijayaguru G <vijay{_AT_}collab.net>
Suggested by: kameshj
]]]
Index: subversion/libsvn_subr/subst.c
===================================================================
--- subversion/libsvn_subr/subst.c (revision 1053308)
+++ subversion/libsvn_subr/subst.c (working copy)
@@ -1760,7 +1760,7 @@
return svn_stream_read(btn->read_stream, buffer, len);
else
return svn_error_createf(APR_ENOENT, NULL,
- "Can't read special file: File '%s' not found",
+ _("Can't read special file: File '%s' not found"),
svn_dirent_local_style(btn->path, btn->pool));
}
Index: subversion/libsvn_subr/config_file.c
===================================================================
--- subversion/libsvn_subr/config_file.c (revision 1053308)
+++ subversion/libsvn_subr/config_file.c (working copy)
@@ -259,7 +259,7 @@
{
ch = EOF;
err = svn_error_createf(SVN_ERR_MALFORMED_FILE, NULL,
- "%s:%d: Option must end with ':' or '='",
+ _("%s:%d: Option must end with ':' or '='"),
svn_dirent_local_style(ctx->file, pool),
ctx->line);
}
@@ -302,7 +302,7 @@
{
ch = EOF;
err = svn_error_createf(SVN_ERR_MALFORMED_FILE, NULL,
- "%s:%d: Section header must end with ']'",
+ _("%s:%d: Section header must end with ']'"),
svn_dirent_local_style(ctx->file, pool),
ctx->line);
}
@@ -401,8 +401,8 @@
SVN_ERR(parse_section_name(&ch, &ctx, pool));
else
return svn_error_createf(SVN_ERR_MALFORMED_FILE, NULL,
- "%s:%d: Section header"
- " must start in the first column",
+ _("%s:%d: Section header"
+ " must start in the first column"),
svn_dirent_local_style(file, pool),
ctx.line);
break;
@@ -415,8 +415,8 @@
}
else
return svn_error_createf(SVN_ERR_MALFORMED_FILE, NULL,
- "%s:%d: Comment"
- " must start in the first column",
+ _("%s:%d: Comment"
+ " must start in the first column"),
svn_dirent_local_style(file, pool),
ctx.line);
break;
@@ -431,12 +431,12 @@
default:
if (svn_stringbuf_isempty(ctx.section))
return svn_error_createf(SVN_ERR_MALFORMED_FILE, NULL,
- "%s:%d: Section header expected",
+ _("%s:%d: Section header expected"),
svn_dirent_local_style(file, pool),
ctx.line);
else if (count != 0)
return svn_error_createf(SVN_ERR_MALFORMED_FILE, NULL,
- "%s:%d: Option expected",
+ _("%s:%d: Option expected"),
svn_dirent_local_style(file, pool),
ctx.line);
else
Index: subversion/libsvn_subr/auth.c
===================================================================
--- subversion/libsvn_subr/auth.c (revision 1053308)
+++ subversion/libsvn_subr/auth.c (working copy)
@@ -183,7 +183,7 @@
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. */
Index: subversion/libsvn_subr/stream.c
===================================================================
--- subversion/libsvn_subr/stream.c (revision 1053308)
+++ subversion/libsvn_subr/stream.c (working copy)
@@ -884,10 +884,10 @@
}
if (stream->msg != NULL)
- return svn_error_createf(status, NULL, "zlib (%s): %s: %s", function,
+ return svn_error_createf(status, NULL, _("zlib (%s): %s: %s"), function,
message, stream->msg);
else
- return svn_error_createf(status, NULL, "zlib (%s): %s", function,
+ return svn_error_createf(status, NULL, _("zlib (%s): %s"), function,
message);
}
Index: subversion/libsvn_subr/config_win.c
===================================================================
--- subversion/libsvn_subr/config_win.c (revision 1053308)
+++ subversion/libsvn_subr/config_win.c (working copy)
@@ -63,8 +63,8 @@
folder_ucs2))
return svn_error_create(SVN_ERR_BAD_FILENAME, NULL,
(system_path
- ? "Can't determine the system config path"
- : "Can't determine the user's config path"));
+ ? _("Can't determine the system config path")
+ : _("Can't determine the user's config path")));
/* ### When mapping from UCS-2 to UTF-8, we need at most 3 bytes
per wide char, plus extra space for the nul terminator. */
@@ -122,7 +122,7 @@
}
if (err != ERROR_SUCCESS)
return svn_error_create(SVN_ERR_MALFORMED_FILE, NULL,
- "Can't enumerate registry values");
+ _("Can't enumerate registry values"));
/* Ignore option names that start with '#', see
http://subversion.tigris.org/issues/show_bug.cgi?id=671 */
@@ -139,7 +139,7 @@
}
if (err != ERROR_SUCCESS)
return svn_error_create(SVN_ERR_MALFORMED_FILE, NULL,
- "Can't read registry value data");
+ _("Can't read registry value data"));
svn_config_set(cfg, section, option->data, value->data);
}
@@ -176,7 +176,7 @@
else
{
return svn_error_createf(SVN_ERR_BAD_FILENAME, NULL,
- "Unrecognised registry path '%s'",
+ _("Unrecognised registry path '%s'"),
svn_dirent_local_style(file, pool));
}
@@ -188,11 +188,11 @@
const int is_enoent = APR_STATUS_IS_ENOENT(APR_FROM_OS_ERROR(err));
if (!is_enoent)
return svn_error_createf(SVN_ERR_BAD_FILENAME, NULL,
- "Can't open registry key '%s'",
+ _("Can't open registry key '%s'"),
svn_dirent_local_style(file, pool));
else if (must_exist && is_enoent)
return svn_error_createf(SVN_ERR_BAD_FILENAME, NULL,
- "Can't find registry key '%s'",
+ _("Can't find registry key '%s'"),
svn_dirent_local_style(file, pool));
else
return SVN_NO_ERROR;
@@ -231,7 +231,7 @@
if (err != ERROR_SUCCESS)
{
svn_err = svn_error_create(SVN_ERR_MALFORMED_FILE, NULL,
- "Can't enumerate registry keys");
+ _("Can't enumerate registry keys"));
goto cleanup;
}
@@ -241,7 +241,7 @@
if (err != ERROR_SUCCESS)
{
svn_err = svn_error_create(SVN_ERR_MALFORMED_FILE, NULL,
- "Can't open existing subkey");
+ _("Can't open existing subkey"));
goto cleanup;
}
Index: subversion/svn/util.c
===================================================================
--- subversion/svn/util.c (revision 1053308)
+++ subversion/svn/util.c (working copy)
@@ -623,7 +623,7 @@
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,
Index: subversion/svn/propget-cmd.c
===================================================================
--- subversion/svn/propget-cmd.c (revision 1053308)
+++ subversion/svn/propget-cmd.c (working copy)
@@ -61,7 +61,7 @@
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;
}
Index: subversion/libsvn_fs_base/bdb/strings-table.c
===================================================================
--- subversion/libsvn_fs_base/bdb/strings-table.c (revision 1053308)
+++ subversion/libsvn_fs_base/bdb/strings-table.c (working copy)
@@ -112,7 +112,7 @@
svn_bdb_dbc_close(*cursor);
return svn_error_createf
(SVN_ERR_FS_NO_SUCH_STRING, 0,
- "No such string '%s'", (const char *)query->data);
+ _("No such string '%s'"), (const char *)query->data);
}
if (db_err)
{
@@ -384,7 +384,7 @@
if (db_err == DB_NOTFOUND)
return svn_error_createf
(SVN_ERR_FS_NO_SUCH_STRING, 0,
- "No such string '%s'", key);
+ _("No such string '%s'"), key);
/* Handle any other error conditions. */
SVN_ERR(BDB_WRAP(fs, "clearing string", db_err));
@@ -460,7 +460,7 @@
if (db_err == DB_NOTFOUND)
return svn_error_createf
(SVN_ERR_FS_NO_SUCH_STRING, 0,
- "No such string '%s'", key);
+ _("No such string '%s'"), key);
/* Handle any other error conditions. */
return BDB_WRAP(fs, "deleting string", db_err);
Index: subversion/libsvn_fs_base/bdb/env.c
===================================================================
--- subversion/libsvn_fs_base/bdb/env.c (revision 1053308)
+++ subversion/libsvn_fs_base/bdb/env.c (working copy)
@@ -226,7 +226,7 @@
SVN_BDB_ERROR_GATHERER_IGNORE(dbenv);
- new_err = svn_error_createf(SVN_NO_ERROR, NULL, "bdb: %s", msg);
+ new_err = svn_error_createf(SVN_NO_ERROR, NULL, _("bdb: %s"), msg);
if (error_info->pending_errors)
svn_error_compose(error_info->pending_errors, new_err);
else
@@ -321,8 +321,8 @@
pool);
if (apr_err)
return svn_error_create(apr_err, NULL,
- "Can't allocate thread-specific storage"
- " for the Berkeley DB environment descriptor");
+ _("Can't allocate thread-specific storage"
+ " for the Berkeley DB environment descriptor"));
}
#endif /* APR_HAS_THREADS */
@@ -390,8 +390,8 @@
if (apr_err)
{
return svn_error_create(apr_err, NULL,
- "Couldn't initialize the cache of"
- " Berkeley DB environment descriptors");
+ _("Couldn't initialize the cache of"
+ " Berkeley DB environment descriptors"));
}
apr_pool_cleanup_register(bdb_cache_pool, NULL, clear_cache,
apr_pool_cleanup_null);
@@ -657,18 +657,18 @@
{
if (flags & DB_PRIVATE)
return svn_error_create(SVN_ERR_FS_BERKELEY_DB, NULL,
- "Reopening a public Berkeley DB"
- " environment with private attributes");
+ _("Reopening a public Berkeley DB"
+ " environment with private attributes"));
else
return svn_error_create(SVN_ERR_FS_BERKELEY_DB, NULL,
- "Reopening a private Berkeley DB"
- " environment with public attributes");
+ _("Reopening a private Berkeley DB"
+ " environment with public attributes"));
}
/* Otherwise return a generic "flags-mismatch" error. */
return svn_error_create(SVN_ERR_FS_BERKELEY_DB, NULL,
- "Reopening a Berkeley DB environment"
- " with different attributes");
+ _("Reopening a Berkeley DB environment"
+ " with different attributes"));
}
if (!bdb)
Index: subversion/libsvn_fs_base/bdb/rev-table.c
===================================================================
--- subversion/libsvn_fs_base/bdb/rev-table.c (revision 1053308)
+++ subversion/libsvn_fs_base/bdb/rev-table.c (working copy)
@@ -197,8 +197,8 @@
return
svn_error_createf
(SVN_ERR_FS_CORRUPT, 0,
- "Corrupt DB: revision 0 missing from 'revisions' table, in "
- "filesystem '%s'", fs->path);
+ _("Corrupt DB: revision 0 missing from 'revisions' table, in "
+ "filesystem '%s'"), fs->path);
SVN_ERR(BDB_WRAP(fs, "getting youngest revision (finding last entry)",
db_err));
Index: subversion/libsvn_fs_base/lock.c
===================================================================
--- subversion/libsvn_fs_base/lock.c (revision 1053308)
+++ subversion/libsvn_fs_base/lock.c (working copy)
@@ -127,12 +127,12 @@
from HEAD. That counts as being 'out of date'. */
if (! SVN_IS_VALID_REVNUM(created_rev))
return svn_error_createf(SVN_ERR_FS_OUT_OF_DATE, NULL,
- "Path '%s' doesn't exist in HEAD revision",
+ _("Path '%s' doesn't exist in HEAD revision"),
args->path);
if (args->current_rev < created_rev)
return svn_error_createf(SVN_ERR_FS_OUT_OF_DATE, NULL,
- "Lock failed: newer version of '%s' exists",
+ _("Lock failed: newer version of '%s' exists"),
args->path);
}
@@ -156,8 +156,8 @@
SVN_ERR(err);
if (strcmp(lock_from_token->path, args->path) != 0)
return svn_error_create(SVN_ERR_FS_BAD_LOCK_TOKEN, NULL,
- "Lock failed: token refers to existing "
- "lock with non-matching path.");
+ _("Lock failed: token refers to existing "
+ "lock with non-matching path."));
}
}
Index: subversion/libsvn_fs_base/util/fs_skels.c
===================================================================
--- subversion/libsvn_fs_base/util/fs_skels.c (revision 1053308)
+++ subversion/libsvn_fs_base/util/fs_skels.c (working copy)
@@ -42,7 +42,7 @@
skel_err(const char *skel_type)
{
return svn_error_createf(SVN_ERR_FS_MALFORMED_SKEL, NULL,
- "Malformed%s%s skeleton",
+ _("Malformed%s%s skeleton"),
skel_type ? " " : "",
skel_type ? skel_type : "");
}
Index: subversion/svnlook/main.c
===================================================================
--- subversion/svnlook/main.c (revision 1053308)
+++ subversion/svnlook/main.c (working copy)
@@ -1571,7 +1571,7 @@
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;
Index: subversion/libsvn_client/delete.c
===================================================================
--- subversion/libsvn_client/delete.c (revision 1053308)
+++ subversion/libsvn_client/delete.c (working copy)
@@ -230,7 +230,7 @@
&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);
Index: subversion/libsvn_client/repos_diff.c
===================================================================
--- subversion/libsvn_client/repos_diff.c (revision 1053308)
+++ subversion/libsvn_client/repos_diff.c (working copy)
@@ -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 @@
*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));
}
Index: subversion/libsvn_ra_neon/util.c
===================================================================
--- subversion/libsvn_ra_neon/util.c (revision 1053308)
+++ subversion/libsvn_ra_neon/util.c (working copy)
@@ -651,7 +651,7 @@
/*### 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 @@
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:
Index: subversion/libsvn_ra_serf/auth_digest.c
===================================================================
--- subversion/libsvn_ra_serf/auth_digest.c (revision 1053308)
+++ subversion/libsvn_ra_serf/auth_digest.c (working copy)
@@ -311,8 +311,8 @@
{
/* 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;
Index: subversion/libsvn_ra_serf/auth.c
===================================================================
--- subversion/libsvn_ra_serf/auth.c (revision 1053308)
+++ subversion/libsvn_ra_serf/auth.c (working copy)
@@ -335,7 +335,7 @@
{
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 @@
{
/* 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 @@
{
/* 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 @@
{
/* 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,
Index: subversion/libsvn_ra_serf/util.c
===================================================================
--- subversion/libsvn_ra_serf/util.c (revision 1053308)
+++ subversion/libsvn_ra_serf/util.c (working copy)
@@ -963,12 +963,12 @@
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_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)
Index: subversion/libsvn_ra_serf/win32_auth_sspi.c
===================================================================
--- subversion/libsvn_ra_serf/win32_auth_sspi.c (revision 1053308)
+++ subversion/libsvn_ra_serf/win32_auth_sspi.c (working copy)
@@ -98,7 +98,7 @@
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 @@
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 @@
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 @@
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;
Index: subversion/libsvn_ra_serf/commit.c
===================================================================
--- subversion/libsvn_ra_serf/commit.c (revision 1053308)
+++ subversion/libsvn_ra_serf/commit.c (working copy)
@@ -230,7 +230,7 @@
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));
Index: subversion/libsvn_repos/fs-wrap.c
===================================================================
--- subversion/libsvn_repos/fs-wrap.c (revision 1053308)
+++ subversion/libsvn_repos/fs-wrap.c (working copy)
@@ -458,7 +458,7 @@
if (! username)
return svn_error_createf
(SVN_ERR_FS_NO_USER, NULL,
- "Cannot lock path '%s', no authenticated username available.", path);
+ _("Cannot lock path '%s', no authenticated username available."), path);
/* Run pre-lock hook. This could throw error, preventing
svn_fs_lock() from happening. */
@@ -475,7 +475,7 @@
if ((err = svn_repos__hooks_post_lock(repos, paths, username, pool)))
return svn_error_create
(SVN_ERR_REPOS_POST_LOCK_HOOK_FAILED, err,
- "Lock succeeded, but post-lock hook failed");
+ _("Lock succeeded, but post-lock hook failed"));
return SVN_NO_ERROR;
}
Index: subversion/libsvn_repos/commit.c
===================================================================
--- subversion/libsvn_repos/commit.c (revision 1053308)
+++ subversion/libsvn_repos/commit.c (working copy)
@@ -723,7 +723,7 @@
error. */
if (! eb->txn)
return svn_error_create(SVN_ERR_REPOS_BAD_ARGS, NULL,
- "No valid transaction supplied to close_edit");
+ _("No valid transaction supplied to close_edit"));
/* Commit. */
err = svn_repos_fs_commit_txn(&conflict, eb->repos,
@@ -845,7 +845,7 @@
authz_baton, pool));
if (!allowed)
return svn_error_create(SVN_ERR_AUTHZ_UNWRITABLE, NULL,
- "Not authorized to open a commit editor.");
+ _("Not authorized to open a commit editor."));
}
/* Allocate the structures. */
Index: subversion/libsvn_repos/delta.c
===================================================================
--- subversion/libsvn_repos/delta.c (revision 1053308)
+++ subversion/libsvn_repos/delta.c (working copy)
@@ -201,7 +201,7 @@
{
return svn_error_createf
(SVN_ERR_FS_NOT_DIRECTORY, 0,
- "Invalid %s directory '%s'",
+ _("Invalid %s directory '%s'"),
role, path ? path : "(null)");
}
Index: subversion/libsvn_repos/authz.c
===================================================================
--- subversion/libsvn_repos/authz.c (revision 1053308)
+++ subversion/libsvn_repos/authz.c (working copy)
@@ -33,7 +33,7 @@
#include "svn_repos.h"
#include "svn_config.h"
#include "svn_ctype.h"
-
+#include "svn_private_config.h"
/*** Structures. ***/
@@ -473,8 +473,8 @@
sign of a typo. Refuse to perform authz on uncertain rules. */
if (!value)
return svn_error_createf(SVN_ERR_AUTHZ_INVALID_CONFIG, NULL,
- "An authz rule refers to group '%s', "
- "which is undefined",
+ _("An authz rule refers to group '%s', "
+ "which is undefined"),
group);
list = svn_cstring_split(value, ",", TRUE, pool);
@@ -492,8 +492,8 @@
APR_HASH_KEY_STRING))
return svn_error_createf(SVN_ERR_AUTHZ_INVALID_CONFIG,
NULL,
- "Circular dependency between "
- "groups '%s' and '%s'",
+ _("Circular dependency between "
+ "groups '%s' and '%s'"),
&group_user[1], group);
/* Add group to hash of checked groups. */
@@ -519,8 +519,8 @@
sign of a typo. Refuse to perform authz on uncertain rules. */
if (!alias)
return svn_error_createf(SVN_ERR_AUTHZ_INVALID_CONFIG, NULL,
- "An authz rule refers to alias '%s', "
- "which is undefined",
+ _("An authz rule refers to alias '%s', "
+ "which is undefined"),
&group_user[1]);
}
}
@@ -563,9 +563,9 @@
if (match[0] == '~')
{
b->err = svn_error_createf(SVN_ERR_AUTHZ_INVALID_CONFIG, NULL,
- "Rule '%s' has more than one "
+ _("Rule '%s' has more than one "
"inversion; double negatives are "
- "not permitted.",
+ "not permitted."),
rule_match_string);
return FALSE;
}
@@ -574,9 +574,9 @@
if (strcmp(match, "*") == 0)
{
b->err = svn_error_create(SVN_ERR_AUTHZ_INVALID_CONFIG, NULL,
- "Authz rules with match string '~*' "
+ _("Authz rules with match string '~*' "
"are not allowed, because they never "
- "match anyone.");
+ "match anyone."));
return FALSE;
}
}
@@ -594,8 +594,8 @@
if (!val)
{
b->err = svn_error_createf(SVN_ERR_AUTHZ_INVALID_CONFIG, NULL,
- "An authz rule refers to group "
- "'%s', which is undefined",
+ _("An authz rule refers to group "
+ "'%s', which is undefined"),
rule_match_string);
return FALSE;
}
@@ -611,8 +611,8 @@
if (!val)
{
b->err = svn_error_createf(SVN_ERR_AUTHZ_INVALID_CONFIG, NULL,
- "An authz rule refers to alias "
- "'%s', which is undefined",
+ _("An authz rule refers to alias "
+ "'%s', which is undefined"),
rule_match_string);
return FALSE;
}
@@ -627,7 +627,7 @@
&& (strcmp(token_name, "authenticated") != 0))
{
b->err = svn_error_createf(SVN_ERR_AUTHZ_INVALID_CONFIG, NULL,
- "Unrecognized authz token '%s'.",
+ _("Unrecognized authz token '%s'."),
rule_match_string);
return FALSE;
}
@@ -640,8 +640,8 @@
if (*val != 'r' && *val != 'w' && ! svn_ctype_isspace(*val))
{
b->err = svn_error_createf(SVN_ERR_AUTHZ_INVALID_CONFIG, NULL,
- "The character '%c' in rule '%s' is not "
- "allowed in authz rules", *val,
+ _("The character '%c' in rule '%s' is not "
+ "allowed in authz rules"), *val,
rule_match_string);
return FALSE;
}
Index: subversion/svnserve/serve.c
===================================================================
--- subversion/svnserve/serve.c (revision 1053308)
+++ subversion/svnserve/serve.c (working copy)
@@ -347,7 +347,7 @@
len = strlen(repos_url);
if (strncmp(url, repos_url, len) != 0)
return svn_error_createf(SVN_ERR_RA_ILLEGAL_URL, NULL,
- "'%s' is not the same repository as '%s'",
+ _("'%s' is not the same repository as '%s'"),
url, repos_url);
*fs_path = url + len;
if (! **fs_path)
@@ -1084,8 +1084,8 @@
{
svn_error_t *err;
err = svn_error_create(SVN_ERR_INCORRECT_PARAMS, NULL,
- "'previous-value' and 'dont-care' cannot both be "
- "set in 'change-rev-prop2' request");
+ _("'previous-value' and 'dont-care' cannot both be "
+ "set in 'change-rev-prop2' request"));
return log_fail_and_flush(err, b, conn, pool);
}
@@ -1196,17 +1196,17 @@
svn_ra_svn_item_t);
if (item->kind != SVN_RA_SVN_LIST)
return svn_error_create(SVN_ERR_RA_SVN_MALFORMED_DATA, NULL,
- "Lock tokens aren't a list of lists");
+ _("Lock tokens aren't a list of lists"));
path_item = &APR_ARRAY_IDX(item->u.list, 0, svn_ra_svn_item_t);
if (path_item->kind != SVN_RA_SVN_STRING)
return svn_error_create(SVN_ERR_RA_SVN_MALFORMED_DATA, NULL,
- "Lock path isn't a string");
+ _("Lock path isn't a string"));
token_item = &APR_ARRAY_IDX(item->u.list, 1, svn_ra_svn_item_t);
if (token_item->kind != SVN_RA_SVN_STRING)
return svn_error_create(SVN_ERR_RA_SVN_MALFORMED_DATA, NULL,
- "Lock token isn't a string");
+ _("Lock token isn't a string"));
path = path_item->u.string->data;
full_path = svn_uri_join(sb->fs_path->data,
@@ -1492,7 +1492,7 @@
if (elt->kind != SVN_RA_SVN_WORD)
return svn_error_create(SVN_ERR_RA_SVN_MALFORMED_DATA, NULL,
- "Dirent field not a string");
+ _("Dirent field not a string"));
if (strcmp(SVN_RA_SVN_DIRENT_KIND, elt->u.word) == 0)
dirent_fields |= SVN_DIRENT_KIND;
@@ -2178,8 +2178,8 @@
elt = &APR_ARRAY_IDX(loc_revs_proto, i, svn_ra_svn_item_t);
if (elt->kind != SVN_RA_SVN_NUMBER)
return svn_error_create(SVN_ERR_RA_SVN_MALFORMED_DATA, NULL,
- "Get-locations location revisions entry "
- "not a revision number");
+ _("Get-locations location revisions entry "
+ "not a revision number"));
revision = (svn_revnum_t)(elt->u.number);
APR_ARRAY_PUSH(location_revisions, svn_revnum_t) = revision;
}
@@ -2265,8 +2265,8 @@
&& (end_rev > start_rev))
{
err = svn_error_createf(SVN_ERR_INCORRECT_PARAMS, NULL,
- "Get-location-segments end revision must not be "
- "younger than start revision");
+ _("Get-location-segments end revision must not be "
+ "younger than start revision"));
return log_fail_and_flush(err, b, conn, pool);
}
@@ -2275,8 +2275,8 @@
&& (start_rev > peg_revision))
{
err = svn_error_createf(SVN_ERR_INCORRECT_PARAMS, NULL,
- "Get-location-segments start revision must not "
- "be younger than peg revision");
+ _("Get-location-segments start revision must not "
+ "be younger than peg revision"));
return log_fail_and_flush(err, b, conn, pool);
}
@@ -2492,7 +2492,7 @@
if (item->kind != SVN_RA_SVN_LIST)
return svn_error_create(SVN_ERR_RA_SVN_MALFORMED_DATA, NULL,
- "Lock requests should be list of lists");
+ _("Lock requests should be list of lists"));
SVN_ERR(svn_ra_svn_parse_tuple(item->u.list, pool, "c(?r)", &path,
¤t_rev));
@@ -2613,7 +2613,7 @@
if (item->kind != SVN_RA_SVN_LIST)
return svn_error_create(SVN_ERR_RA_SVN_MALFORMED_DATA, NULL,
- "Unlock request should be a list of lists");
+ _("Unlock request should be a list of lists"));
SVN_ERR(svn_ra_svn_parse_tuple(item->u.list, subpool, "c(?c)", &path,
&token));
@@ -2717,7 +2717,7 @@
(depth != svn_depth_infinity))
{
err = svn_error_create(SVN_ERR_INCORRECT_PARAMS, NULL,
- "Invalid 'depth' specified in get-locks request");
+ _("Invalid 'depth' specified in get-locks request"));
return log_fail_and_flush(err, b, conn, pool);
}
@@ -2964,7 +2964,7 @@
path = skip_scheme_part(url);
if (path == NULL)
return svn_error_createf(SVN_ERR_BAD_URL, NULL,
- "Non-svn URL passed to svn server: '%s'", url);
+ _("Non-svn URL passed to svn server: '%s'"), url);
path = strchr(path, '/');
path = (path == NULL) ? "" : path + 1;
@@ -2977,7 +2977,7 @@
++path;
if (!repos_path_valid(path))
return svn_error_create(SVN_ERR_BAD_FILENAME, NULL,
- "Couldn't determine repository path");
+ _("Couldn't determine repository path"));
/* Join the server-configured root with the client path. */
full_path = svn_uri_join(svn_uri_canonicalize(root, pool),
@@ -2987,7 +2987,7 @@
repos_root = svn_repos_find_root_path(full_path, pool);
if (!repos_root)
return svn_error_createf(SVN_ERR_RA_SVN_REPOS_NOT_FOUND, NULL,
- "No repository found in '%s'", url);
+ _("No repository found in '%s'"), url);
/* Open the repository and fill in b with the resulting information. */
SVN_ERR(svn_repos_open(&b->repos, repos_root, pool));
Index: subversion/libsvn_fs_fs/fs_fs.c
===================================================================
--- subversion/libsvn_fs_fs/fs_fs.c (revision 1053308)
+++ subversion/libsvn_fs_fs/fs_fs.c (working copy)
@@ -2357,7 +2357,7 @@
{
svn_string_t *id_string = svn_fs_fs__id_unparse(id, pool);
return svn_error_createf(SVN_ERR_FS_CORRUPT, err,
- "Corrupt node-revision '%s'",
+ _("Corrupt node-revision '%s'"),
id_string->data);
}
return svn_error_return(err);
@@ -3084,7 +3084,7 @@
### And anyone going to debug corruption errors is probably
### going to jump straight to this comment anyway! */
return svn_error_createf(SVN_ERR_FS_CORRUPT, err,
- "Corrupt representation '%s'",
+ _("Corrupt representation '%s'"),
representation_string(rep, ffd->format, TRUE,
pool));
}
Index: subversion/libsvn_fs_fs/dag.c
===================================================================
--- subversion/libsvn_fs_fs/dag.c (revision 1053308)
+++ subversion/libsvn_fs_fs/dag.c (working copy)
@@ -497,7 +497,7 @@
svn_string_t *idstr = svn_fs_fs__id_unparse(node->id, pool);
return svn_error_createf
(SVN_ERR_FS_NOT_MUTABLE, NULL,
- "Can't set proplist on *immutable* node-revision %s",
+ _("Can't set proplist on *immutable* node-revision %s"),
idstr->data);
}
@@ -522,7 +522,7 @@
svn_string_t *idstr = svn_fs_fs__id_unparse(node->id, pool);
return svn_error_createf
(SVN_ERR_FS_NOT_MUTABLE, NULL,
- "Can't increment mergeinfo count on *immutable* node-revision %s",
+ _("Can't increment mergeinfo count on *immutable* node-revision %s"),
idstr->data);
}
@@ -574,7 +574,7 @@
svn_string_t *idstr = svn_fs_fs__id_unparse(node->id, pool);
return svn_error_createf
(SVN_ERR_FS_NOT_MUTABLE, NULL,
- "Can't set mergeinfo flag on *immutable* node-revision %s",
+ _("Can't set mergeinfo flag on *immutable* node-revision %s"),
idstr->data);
}
@@ -648,13 +648,13 @@
if (! svn_fs_fs__dag_check_mutable(parent))
return svn_error_createf
(SVN_ERR_FS_NOT_MUTABLE, NULL,
- "Attempted to clone child of non-mutable node");
+ _("Attempted to clone child of non-mutable node"));
/* Make sure that NAME is a single path component. */
if (! svn_path_is_single_path_component(name))
return svn_error_createf
(SVN_ERR_FS_NOT_SINGLE_PATH_COMPONENT, NULL,
- "Attempted to make a child clone with an illegal name '%s'", name);
+ _("Attempted to make a child clone with an illegal name '%s'"), name);
/* Find the node named NAME in PARENT's entries list if it exists. */
SVN_ERR(svn_fs_fs__dag_open(&cur_entry, parent, name, pool));
@@ -748,19 +748,19 @@
if (parent->kind != svn_node_dir)
return svn_error_createf
(SVN_ERR_FS_NOT_DIRECTORY, NULL,
- "Attempted to delete entry '%s' from *non*-directory node", name);
+ _("Attempted to delete entry '%s' from *non*-directory node"), name);
/* Make sure parent is mutable. */
if (! svn_fs_fs__dag_check_mutable(parent))
return svn_error_createf
(SVN_ERR_FS_NOT_MUTABLE, NULL,
- "Attempted to delete entry '%s' from immutable directory node", name);
+ _("Attempted to delete entry '%s' from immutable directory node"), name);
/* Make sure that NAME is a single path component. */
if (! svn_path_is_single_path_component(name))
return svn_error_createf
(SVN_ERR_FS_NOT_SINGLE_PATH_COMPONENT, NULL,
- "Attempted to delete a node with an illegal name '%s'", name);
+ _("Attempted to delete a node with an illegal name '%s'"), name);
/* Get a fresh NODE-REVISION for the parent node. */
SVN_ERR(get_node_revision(&parent_noderev, parent, pool));
@@ -779,7 +779,7 @@
if (! dirent)
return svn_error_createf
(SVN_ERR_FS_NO_SUCH_ENTRY, NULL,
- "Delete failed--directory has no entry '%s'", name);
+ _("Delete failed--directory has no entry '%s'"), name);
/* Copy the ID out of the subpool and release the rest of the
directory listing. */
@@ -808,7 +808,7 @@
/* If immutable, do nothing and return immediately. */
if (! svn_fs_fs__dag_check_mutable(node))
return svn_error_createf(SVN_ERR_FS_NOT_MUTABLE, NULL,
- "Attempted removal of immutable node");
+ _("Attempted removal of immutable node"));
/* Delete the node revision. */
return svn_fs_fs__delete_node_revision(fs, id, pool);
@@ -894,7 +894,7 @@
if (file->kind != svn_node_file)
return svn_error_createf
(SVN_ERR_FS_NOT_FILE, NULL,
- "Attempted to get textual contents of a *non*-file node");
+ _("Attempted to get textual contents of a *non*-file node"));
/* Go get a fresh node-revision for FILE. */
SVN_ERR(get_node_revision(&noderev, file, pool));
@@ -923,7 +923,7 @@
|| target->kind != svn_node_file)
return svn_error_createf
(SVN_ERR_FS_NOT_FILE, NULL,
- "Attempted to get textual contents of a *non*-file node");
+ _("Attempted to get textual contents of a *non*-file node"));
/* Go get fresh node-revisions for the nodes. */
if (source)
@@ -949,7 +949,7 @@
if (file->kind != svn_node_file)
return svn_error_createf
(SVN_ERR_FS_NOT_FILE, NULL,
- "Attempted to get length of a *non*-file node");
+ _("Attempted to get length of a *non*-file node"));
/* Go get a fresh node-revision for FILE, and . */
SVN_ERR(get_node_revision(&noderev, file, pool));
@@ -969,7 +969,7 @@
if (file->kind != svn_node_file)
return svn_error_createf
(SVN_ERR_FS_NOT_FILE, NULL,
- "Attempted to get checksum of a *non*-file node");
+ _("Attempted to get checksum of a *non*-file node"));
SVN_ERR(get_node_revision(&noderev, file, pool));
@@ -989,13 +989,13 @@
if (file->kind != svn_node_file)
return svn_error_createf
(SVN_ERR_FS_NOT_FILE, NULL,
- "Attempted to set textual contents of a *non*-file node");
+ _("Attempted to set textual contents of a *non*-file node"));
/* Make sure our node is mutable. */
if (! svn_fs_fs__dag_check_mutable(file))
return svn_error_createf
(SVN_ERR_FS_NOT_MUTABLE, NULL,
- "Attempted to set textual contents of an immutable node");
+ _("Attempted to set textual contents of an immutable node"));
/* Get the node revision. */
SVN_ERR(get_node_revision(&noderev, file, pool));
@@ -1210,13 +1210,13 @@
if (! node_id)
return svn_error_createf
(SVN_ERR_FS_NOT_FOUND, NULL,
- "Attempted to open non-existent child node '%s'", name);
+ _("Attempted to open non-existent child node '%s'"), name);
/* Make sure that NAME is a single path component. */
if (! svn_path_is_single_path_component(name))
return svn_error_createf
(SVN_ERR_FS_NOT_SINGLE_PATH_COMPONENT, NULL,
- "Attempted to open node with an illegal name '%s'", name);
+ _("Attempted to open node with an illegal name '%s'"), name);
/* Now get the node that was requested. */
return svn_fs_fs__dag_get_node(child_p, svn_fs_fs__dag_get_fs(parent),
