More _().
* (many files) More strings marked for i18n.
Index: subversion/svnadmin/main.c
===================================================================
--- subversion/svnadmin/main.c (revision 9708)
+++ subversion/svnadmin/main.c (copia de trabajo)
@@ -431,7 +431,7 @@
if ((start > youngest) || (end > youngest))
return svn_error_createf
(SVN_ERR_CL_ARG_PARSING_ERROR, NULL,
- "Revisions must not be greater than the youngest revision (%ld)",
+ _("Revisions must not be greater than the youngest revision (%ld)"),
youngest);
/* Loop over the requested revision range, performing the
@@ -441,7 +441,7 @@
svn_pool_clear (subpool);
SVN_ERR (check_cancel (NULL));
if (! opt_state->quiet)
- printf ("Deltifying revision %ld...", revision);
+ printf (_("Deltifying revision %ld..."), revision);
SVN_ERR (svn_fs_deltify_revision (fs, revision, subpool));
if (! opt_state->quiet)
printf (_("done.\n"));
@@ -499,7 +499,7 @@
if ((lower > youngest) || (upper > youngest))
return svn_error_createf
(SVN_ERR_CL_ARG_PARSING_ERROR, NULL,
- "Revisions must not be greater than the youngest revision (%ld)",
+ _("Revisions must not be greater than the youngest revision (%ld)"),
youngest);
/* Run the dump to STDOUT. Let the user redirect output into
@@ -614,7 +614,7 @@
recovery actually worked. */
SVN_ERR (open_repos (&repos, opt_state->repository_path, pool));
SVN_ERR (svn_fs_youngest_rev (&youngest_rev, svn_repos_fs (repos), pool));
- printf ("The latest repos revision is %ld.\n",
+ printf (_("The latest repos revision is %ld.\n"),
youngest_rev);
return SVN_NO_ERROR;
Index: subversion/libsvn_wc/adm_files.c
===================================================================
--- subversion/libsvn_wc/adm_files.c (revision 9708)
+++ subversion/libsvn_wc/adm_files.c (copia de trabajo)
@@ -900,8 +900,8 @@
&& !(entry->schedule == svn_wc_schedule_delete && revision == 0))
return
svn_error_createf (SVN_ERR_WC_OBSTRUCTED_UPDATE, NULL,
- "Revision %ld doesn't match existing revision %ld"
- " in '%s'",
+ _("Revision %ld doesn't match existing revision %ld"
+ " in '%s'"),
revision, entry->revision, path);
/** ### comparing URLs, should they be canonicalized first? */
Index: subversion/libsvn_wc/update_editor.c
===================================================================
--- subversion/libsvn_wc/update_editor.c (revision 9708)
+++ subversion/libsvn_wc/update_editor.c (copia de trabajo)
@@ -858,7 +858,8 @@
SVN_ERR_W (svn_io_file_write_full (log_fp, log_item->data,
log_item->len, NULL, pool),
apr_psprintf (pool,
- _("Error writing log file for '%s'"), parent_path));
+ _("Error writing log file for '%s'"),
+ parent_path));
SVN_ERR (svn_wc__close_adm_file (log_fp,
parent_path,
@@ -1537,8 +1538,8 @@
{
return svn_error_createf
(SVN_ERR_WC_CORRUPT_TEXT_BASE, NULL,
- _("Checksum mismatch for '%s'; recorded: '%s', actual: '%s'"),
- tb, ent->checksum, hex_digest);
+ _("Checksum mismatch for '%s'; recorded: '%s', "
+ "actual: '%s'"), tb, ent->checksum, hex_digest);
}
}
}
Index: subversion/libsvn_client/export.c
===================================================================
--- subversion/libsvn_client/export.c (revision 9708)
+++ subversion/libsvn_client/export.c (copia de trabajo)
@@ -229,7 +229,7 @@
"(local)" since we can't always determine the
current user's username */
fmt = "%ldM";
- author = "(local)";
+ author = _("(local)");
}
else
{
Index: subversion/libsvn_client/ra.c
===================================================================
--- subversion/libsvn_client/ra.c (revision 9708)
+++ subversion/libsvn_client/ra.c (copia de trabajo)
@@ -432,8 +432,8 @@
prev_path = apr_pstrdup (pool, path);
else
return svn_error_createf (SVN_ERR_CLIENT_UNRELATED_RESOURCES, NULL,
- "Missing changed-path information for "
- "'%s' in revision %ld",
+ _("Missing changed-path information for "
+ "'%s' in revision %ld"),
path, revision);
}
@@ -568,7 +568,7 @@
if (lrb.kind == svn_node_none)
return svn_error_createf
(SVN_ERR_FS_NOT_FOUND, NULL,
- "path '%s' doesn't exist in revision %ld",
+ _("path '%s' doesn't exist in revision %ld"),
path, peg_revnum);
/* Populate most of our log receiver baton structure. */
@@ -628,17 +628,17 @@
if (! lrb.start_path)
return svn_error_createf
(APR_EGENERAL, NULL,
- "Unable to find repository location for '%s' in revision %ld",
+ _("Unable to find repository location for '%s' in revision %ld"),
path, start_revnum);
if (! lrb.end_path)
return svn_error_createf
(APR_EGENERAL, NULL,
- "Unable to find repository location for '%s' in revision %ld",
+ _("Unable to find repository location for '%s' in revision %ld"),
path, end_revnum);
if (! lrb.peg_path)
return svn_error_createf
(APR_EGENERAL, NULL,
- "Unable to find repository location for '%s' in revision %ld",
+ _("Unable to find repository location for '%s' in revision %ld"),
path, peg_revnum);
/* Repository paths might be absolute, but we want to treat them as
@@ -658,7 +658,7 @@
if (strcmp (url, svn_path_join (repos_url, lrb.peg_path, pool)) != 0)
return svn_error_createf
(SVN_ERR_CLIENT_UNRELATED_RESOURCES, NULL,
- "'%s' in revision %ld is an unrelated object.",
+ _("'%s' in revision %ld is an unrelated object."),
path, youngest);
}
Index: subversion/libsvn_client/diff.c
===================================================================
--- subversion/libsvn_client/diff.c (revision 9708)
+++ subversion/libsvn_client/diff.c (copia de trabajo)
@@ -264,7 +264,7 @@
{
const char *label;
if (revnum != SVN_INVALID_REVNUM)
- label = apr_psprintf (pool, "%s\t(revision %ld)",
+ label = apr_psprintf (pool, _("%s\t(revision %ld)"),
path, revnum);
else
label = apr_psprintf (pool, _("%s\t(working copy)"), path);
@@ -654,12 +654,12 @@
{
struct merge_cmd_baton *merge_b = baton;
apr_pool_t *subpool = svn_pool_create (merge_b->pool);
- const char *target_label = ".working";
+ const char *target_label = _(".working");
const char *left_label = apr_psprintf (subpool,
- ".merge-left.r%ld",
+ _(".merge-left.r%ld"),
older_rev);
const char *right_label = apr_psprintf (subpool,
- ".merge-right.r%ld",
+ _(".merge-right.r%ld"),
yours_rev);
svn_boolean_t has_local_mods;
svn_boolean_t merge_required = TRUE;
@@ -1639,12 +1639,12 @@
if (kind1 == svn_node_none)
return svn_error_createf
(SVN_ERR_FS_NOT_FOUND, NULL,
- "'%s' was not found in the repository at revision %ld",
+ _("'%s' was not found in the repository at revision %ld"),
url1, rev1);
if (kind2 == svn_node_none)
return svn_error_createf
(SVN_ERR_FS_NOT_FOUND, NULL,
- "'%s' was not found in the repository at revision %ld",
+ _("'%s' was not found in the repository at revision %ld"),
url2, rev2);
if ((kind1 == svn_node_file) || (kind2 == svn_node_file))
{
Index: subversion/libsvn_client/copy.c
===================================================================
--- subversion/libsvn_client/copy.c (revision 9708)
+++ subversion/libsvn_client/copy.c (copia de trabajo)
@@ -35,6 +35,8 @@
#include "client.h"
+#include "svn_private_config.h"
+
/*** Code. ***/
@@ -77,7 +79,7 @@
SVN_ERR (svn_io_check_path (src_path, &src_kind, pool));
if (src_kind == svn_node_none)
return svn_error_createf (SVN_ERR_NODE_UNKNOWN_KIND, NULL,
- "Path '%s' does not exist", src_path);
+ _("Path '%s' does not exist"), src_path);
/* If DST_PATH does not exist, then its basename will become a new
file or dir added to its parent (possibly an implicit '.'). If
@@ -96,7 +98,7 @@
}
else
return svn_error_createf (SVN_ERR_ENTRY_EXISTS, NULL,
- "File '%s' already exists", dst_path);
+ _("File '%s' already exists"), dst_path);
if (is_move)
{
@@ -137,7 +139,7 @@
if (!force)
/* Ensure there are no "awkward" files. */
SVN_ERR_W (svn_client__can_delete (src_path, ctx, pool),
- "Move will not be attempted unless forced");
+ _("Move will not be attempted unless forced"));
}
else
{
@@ -318,7 +320,7 @@
/* We can't move something into itself, period. */
if (svn_path_is_empty (src_rel) && is_move)
return svn_error_createf (SVN_ERR_UNSUPPORTED_FEATURE, NULL,
- "Cannot move URL '%s' into itself", src_url);
+ _("Cannot move URL '%s' into itself"), src_url);
/* Get the RA vtable that matches URL. */
SVN_ERR (svn_ra_init_ra_libs (&ra_baton, pool));
@@ -347,8 +349,8 @@
{
return svn_error_createf
(SVN_ERR_UNSUPPORTED_FEATURE, NULL,
- "Source and dest appear not to be in the same repository "
- "(src: '%s'; dst: '%s')",
+ _("Source and dest appear not to be in the same repository "
+ "(src: '%s'; dst: '%s')"),
src_url, dst_url);
}
else
@@ -378,7 +380,7 @@
if (src_kind == svn_node_none)
return svn_error_createf
(SVN_ERR_FS_NOT_FOUND, NULL,
- "Path '%s' does not exist in revision '%ld'",
+ _("Path '%s' does not exist in revision '%ld'"),
src_url, src_revnum);
/* Figure out the basename that will result from this operation. */
@@ -391,7 +393,7 @@
{
/* We disallow the overwriting of files. */
return svn_error_createf (SVN_ERR_FS_ALREADY_EXISTS, NULL,
- "Path '%s' already exists.", dst_rel);
+ _("Path '%s' already exists."), dst_rel);
}
else if (dst_kind == svn_node_dir)
{
@@ -407,12 +409,12 @@
&attempt_kind, pool));
if (attempt_kind != svn_node_none)
return svn_error_createf (SVN_ERR_FS_ALREADY_EXISTS, NULL,
- "Path '%s' already exists", dst_rel);
+ _("Path '%s' already exists"), dst_rel);
}
else
{
return svn_error_createf (SVN_ERR_NODE_UNKNOWN_KIND, NULL,
- "Unrecognized node kind of '%s'", dst_url);
+ _("Unrecognized node kind of '%s'"), dst_url);
}
/* Create a new commit item and add it to the array. */
@@ -535,7 +537,7 @@
if (commit_err)
{
commit_err = svn_error_quick_wrap
- (commit_err, "Commit failed (details follow):");
+ (commit_err, _("Commit failed (details follow):"));
err = commit_err;
}
@@ -543,14 +545,14 @@
that follow. */
else
err = svn_error_create (SVN_ERR_BASE, NULL,
- "Commit succeeded, but other errors follow:");
+ _("Commit succeeded, but other errors follow:"));
/* If there was an unlock error... */
if (unlock_err)
{
/* Wrap the error with some headers. */
unlock_err = svn_error_quick_wrap
- (unlock_err, "Error unlocking locked dirs (details follow):");
+ (unlock_err, _("Error unlocking locked dirs (details follow):"));
/* Append this error to the chain. */
svn_error_compose (err, unlock_err);
@@ -561,7 +563,7 @@
{
/* Wrap the error with some headers. */
cleanup_err = svn_error_quick_wrap
- (cleanup_err, "Error in post-commit clean-up (details follow):");
+ (cleanup_err, _("Error in post-commit clean-up (details follow):"));
/* Append this error to the chain. */
svn_error_compose (err, cleanup_err);
@@ -640,7 +642,7 @@
/* DST_URL is an existing file, which can't be overwritten or
used as a container, so error out. */
return svn_error_createf (SVN_ERR_FS_ALREADY_EXISTS, NULL,
- "File '%s' already exists", dst_url);
+ _("File '%s' already exists"), dst_url);
}
/* Create a new commit item and add it to the array. */
@@ -786,12 +788,12 @@
if (SVN_IS_VALID_REVNUM (src_revnum))
return svn_error_createf
(SVN_ERR_FS_NOT_FOUND, NULL,
- "Path '%s' not found in revision '%ld'",
+ _("Path '%s' not found in revision '%ld'"),
src_url, src_revnum);
else
return svn_error_createf
(SVN_ERR_FS_NOT_FOUND, NULL,
- "Path '%s' not found in head revision", src_url);
+ _("Path '%s' not found in head revision"), src_url);
}
/* There are two interfering sets of cases to watch out for here:
@@ -828,7 +830,7 @@
else if (dst_kind != svn_node_none) /* must be a file */
{
return svn_error_createf (SVN_ERR_ENTRY_EXISTS, NULL,
- "File '%s' already exists", dst_path);
+ _("File '%s' already exists"), dst_path);
}
/* Now that dst_path has possibly been reset, check that there's
@@ -836,7 +838,7 @@
SVN_ERR (svn_io_check_path (dst_path, &dst_kind, pool));
if (dst_kind != svn_node_none)
return svn_error_createf (SVN_ERR_WC_OBSTRUCTED_UPDATE, NULL,
- "'%s' is in the way", dst_path);
+ _("'%s' is in the way"), dst_path);
SVN_ERR (svn_wc_adm_probe_open2 (&adm_access, NULL, dst_path, TRUE,
0, pool));
@@ -851,7 +853,7 @@
if (ent && (ent->kind != svn_node_dir))
return svn_error_createf
(SVN_ERR_WC_OBSTRUCTED_UPDATE, NULL,
- "Entry for '%s' exists (though the working file is missing)",
+ _("Entry for '%s' exists (though the working file is missing)"),
dst_path);
}
@@ -940,8 +942,8 @@
return svn_error_createf
(SVN_ERR_UNSUPPORTED_FEATURE, NULL,
- "Source URL '%s' is from foreign repository; "
- "leaving it as a disjoint WC", src_url);
+ _("Source URL '%s' is from foreign repository; "
+ "leaving it as a disjoint WC"), src_url);
}
} /* end directory case */
@@ -1016,7 +1018,7 @@
&& svn_path_is_child (src_path, dst_path, pool))
return svn_error_createf
(SVN_ERR_UNSUPPORTED_FEATURE, NULL,
- "Cannot copy path '%s' into its own child '%s'",
+ _("Cannot copy path '%s' into its own child '%s'"),
src_path, dst_path);
if (is_move)
@@ -1026,7 +1028,7 @@
if (strcmp (src_path, dst_path) == 0)
return svn_error_createf
(SVN_ERR_UNSUPPORTED_FEATURE, NULL,
- "Cannot move path '%s' into itself",
+ _("Cannot move path '%s' into itself"),
src_path);
}
else
@@ -1034,7 +1036,7 @@
/* Disallow moves between the working copy and the repository. */
return svn_error_create
(SVN_ERR_UNSUPPORTED_FEATURE, NULL,
- "No support for repos <--> working copy moves");
+ _("No support for repos <--> working copy moves"));
}
/* It doesn't make sense to specify revisions in a move. */
@@ -1049,7 +1051,7 @@
{
return svn_error_create
(SVN_ERR_UNSUPPORTED_FEATURE, NULL,
- "Cannot specify revisions with move operations");
+ _("Cannot specify revisions with move operations"));
}
}
else
@@ -1073,12 +1075,12 @@
if (! entry)
return svn_error_createf
(SVN_ERR_UNVERSIONED_RESOURCE, NULL,
- "'%s' is not under version control", src_path);
+ _("'%s' is not under version control"), src_path);
if (! entry->url)
return svn_error_createf
(SVN_ERR_ENTRY_MISSING_URL, NULL,
- "'%s' does not seem to have a URL associated with it",
+ _("'%s' does not seem to have a URL associated with it"),
src_path);
src_path = entry->url;
Index: subversion/libsvn_client/blame.c
===================================================================
--- subversion/libsvn_client/blame.c (revision 9708)
+++ subversion/libsvn_client/blame.c (copia de trabajo)
@@ -28,6 +28,8 @@
#include "svn_path.h"
#include "svn_sorts.h"
+#include "svn_private_config.h"
+
/* The metadata associated with a particular revision. */
struct rev
{
@@ -318,13 +320,13 @@
if (end_revnum < start_revnum)
return svn_error_create
(SVN_ERR_CLIENT_BAD_REVISION, NULL,
- "Start revision must precede end revision");
+ _("Start revision must precede end revision"));
SVN_ERR (ra_lib->check_path (session, "", end_revnum, &kind, pool));
if (kind == svn_node_dir)
return svn_error_createf (SVN_ERR_CLIENT_IS_DIRECTORY, NULL,
- "URL '%s' refers to a directory", url);
+ _("URL '%s' refers to a directory"), url);
condensed_targets = apr_array_make (pool, 1, sizeof (const char *));
(*((const char **)apr_array_push (condensed_targets))) = "";
@@ -399,9 +401,9 @@
}
else
return svn_error_createf (APR_EGENERAL, NULL,
- "Revision action '%c' for "
+ _("Revision action '%c' for "
"revision %ld of '%s'"
- "lacks a prior revision",
+ "lacks a prior revision"),
lmb.action, lmb.eldest->revision,
lmb.eldest->path);
@@ -442,7 +444,7 @@
if (svn_mime_type_is_binary (mimetype->data))
return svn_error_createf
(SVN_ERR_CLIENT_IS_BINARY_FILE, 0,
- "Cannot calculate blame information for binary file '%s'",
+ _("Cannot calculate blame information for binary file '%s'"),
target);
}
@@ -474,7 +476,7 @@
apr_err = apr_file_open (&file, last, APR_READ, APR_OS_DEFAULT, lastpool);
if (apr_err != APR_SUCCESS)
- return svn_error_wrap_apr (apr_err, "Can't open '%s'", last);
+ return svn_error_wrap_apr (apr_err, _("Can't open '%s'"), last);
apr_pool_cleanup_register (lastpool, file, cleanup_tempfile,
apr_pool_cleanup_null);
Index: subversion/libsvn_client/commit_util.c
===================================================================
--- subversion/libsvn_client/commit_util.c (revision 9708)
+++ subversion/libsvn_client/commit_util.c (copia de trabajo)
@@ -1334,10 +1334,10 @@
const char *copystuffs = "";
if (copyfrom_path && SVN_IS_VALID_REVNUM(copyfrom_revision))
copystuffs = apr_psprintf (pool,
- " (copied from %s:%ld)",
+ _(" (copied from %s:%ld)"),
copyfrom_path,
copyfrom_revision);
- fprintf (stderr, " Adding : %s%s\n", path, copystuffs);
+ fprintf (stderr, _(" Adding : %s%s\n"), path, copystuffs);
*baton = new_baton;
return (*db->eb->real_editor->add_file) (path, db->real_baton,
copyfrom_path, copyfrom_revision,
@@ -1351,7 +1351,7 @@
apr_pool_t *pool)
{
struct item_baton *db = parent_baton;
- fprintf (stderr, " Deleting: %s\n", path);
+ fprintf (stderr, _(" Deleting: %s\n"), path);
return (*db->eb->real_editor->delete_entry) (path, revision,
db->real_baton, pool);
}
@@ -1365,7 +1365,7 @@
{
struct item_baton *db = parent_baton;
struct item_baton *new_baton = make_baton (db->eb, NULL, path, pool);
- fprintf (stderr, " Opening : %s\n", path);
+ fprintf (stderr, _(" Opening : %s\n"), path);
*baton = new_baton;
return (*db->eb->real_editor->open_file) (path, db->real_baton,
base_revision, pool,
@@ -1376,7 +1376,7 @@
close_file (void *baton, const char *text_checksum, apr_pool_t *pool)
{
struct item_baton *fb = baton;
- fprintf (stderr, " Closing : %s\n", fb->path);
+ fprintf (stderr, _(" Closing : %s\n"), fb->path);
return (*fb->eb->real_editor->close_file) (fb->real_baton,
text_checksum, pool);
}
@@ -1389,7 +1389,7 @@
apr_pool_t *pool)
{
struct item_baton *fb = file_baton;
- fprintf (stderr, " PropSet (%s=%s)\n", name, value ? value->data : "");
+ fprintf (stderr, _(" PropSet (%s=%s)\n"), name, value ? value->data : "");
return (*fb->eb->real_editor->change_file_prop) (fb->real_baton,
name, value, pool);
}
@@ -1402,7 +1402,7 @@
void **handler_baton)
{
struct item_baton *fb = file_baton;
- fprintf (stderr, " Transmitting text...\n");
+ fprintf (stderr, _(" Transmitting text...\n"));
return (*fb->eb->real_editor->apply_textdelta) (fb->real_baton,
base_checksum, pool,
handler, handler_baton);
@@ -1412,7 +1412,7 @@
close_edit (void *edit_baton, apr_pool_t *pool)
{
struct edit_baton *eb = edit_baton;
- fprintf (stderr, "TEST EDIT COMPLETED\n");
+ fprintf (stderr, _("TEST EDIT COMPLETED\n"));
return (*eb->real_editor->close_edit) (eb->real_eb, pool);
}
@@ -1429,10 +1429,10 @@
const char *copystuffs = "";
if (copyfrom_path && SVN_IS_VALID_REVNUM(copyfrom_revision))
copystuffs = apr_psprintf (pool,
- " (copied from %s:%ld)",
+ _(" (copied from %s:%ld)"),
copyfrom_path,
copyfrom_revision);
- fprintf (stderr, " Adding : %s%s\n", path, copystuffs);
+ fprintf (stderr, _(" Adding : %s%s\n"), path, copystuffs);
*baton = new_baton;
return (*db->eb->real_editor->add_directory) (path,
db->real_baton,
@@ -1451,7 +1451,7 @@
{
struct item_baton *db = parent_baton;
struct item_baton *new_baton = make_baton (db->eb, NULL, path, pool);
- fprintf (stderr, " Opening : %s\n", path);
+ fprintf (stderr, _(" Opening : %s\n"), path);
*baton = new_baton;
return (*db->eb->real_editor->open_directory) (path, db->real_baton,
base_revision, pool,
@@ -1465,7 +1465,7 @@
apr_pool_t *pool)
{
struct item_baton *db = dir_baton;
- fprintf (stderr, " PropSet (%s=%s)\n", name, value ? value->data : "");
+ fprintf (stderr, _(" PropSet (%s=%s)\n"), name, value ? value->data : "");
return (*db->eb->real_editor->change_dir_prop) (db->real_baton,
name, value, pool);
}
@@ -1474,7 +1474,7 @@
close_directory (void *baton, apr_pool_t *pool)
{
struct item_baton *db = baton;
- fprintf (stderr, " Closing : %s\n", db->path);
+ fprintf (stderr, _(" Closing : %s\n"), db->path);
return (*db->eb->real_editor->close_directory) (db->real_baton, pool);
}
@@ -1482,7 +1482,7 @@
abort_edit (void *edit_baton, apr_pool_t *pool)
{
struct edit_baton *eb = edit_baton;
- fprintf (stderr, "TEST EDIT ABORTED\n");
+ fprintf (stderr, _("TEST EDIT ABORTED\n"));
return (*eb->real_editor->abort_edit) (eb->real_eb, pool);
}
Index: subversion/clients/cmdline/propdel-cmd.c
===================================================================
--- subversion/clients/cmdline/propdel-cmd.c (revision 9708)
+++ subversion/clients/cmdline/propdel-cmd.c (copia de trabajo)
@@ -32,6 +32,8 @@
#include "svn_utf.h"
#include "cl.h"
+#include "svn_private_config.h"
+
/*** Code. ***/
@@ -78,12 +80,12 @@
which needs to be converted to a URL. */
if (targets->nelts <= 0)
return svn_error_create(SVN_ERR_CL_INSUFFICIENT_ARGS, NULL,
- "No URL target available");
+ _("No URL target available"));
target = ((const char **) (targets->elts))[0];
SVN_ERR (svn_client_url_from_path (&URL, target, pool));
if (URL == NULL)
return svn_error_create(SVN_ERR_UNVERSIONED_RESOURCE, NULL,
- "Either a URL or versioned item is required");
+ _("Either a URL or versioned item is required"));
/* Let libsvn_client do the real work. */
SVN_ERR (svn_client_revprop_set (pname_utf8, NULL,
@@ -94,7 +96,7 @@
const char *pname_stdout;
SVN_ERR (svn_cmdline_cstring_from_utf8 (&pname_stdout,
pname_utf8, pool));
- printf ("property '%s' deleted from repository revision '%ld'\n",
+ printf (_("property '%s' deleted from repository revision '%ld'\n"),
pname_stdout, rev);
}
}
@@ -102,7 +104,7 @@
{
return svn_error_createf
(SVN_ERR_CL_ARG_PARSING_ERROR, NULL,
- "Cannot specify revision for deleting versioned property '%s'",
+ _("Cannot specify revision for deleting versioned property '%s'"),
pname);
}
else /* operate on a normal, versioned property (not a revprop) */
@@ -126,9 +128,9 @@
pname_utf8, subpool));
SVN_ERR (svn_cmdline_path_local_style_from_utf8
(&target_stdout, target, subpool));
- printf ("property '%s' deleted%sfrom '%s'.\n", pname_stdout,
- opt_state->recursive ? " (recursively) " : " ",
- target_stdout);
+ printf (_("property '%s' deleted%sfrom '%s'.\n"), pname_stdout,
+ opt_state->recursive ? _(" (recursively) ") : " ",
+ target_stdout);
}
}
svn_pool_destroy (subpool);
Index: subversion/clients/cmdline/util.c
===================================================================
--- subversion/clients/cmdline/util.c (revision 9708)
+++ subversion/clients/cmdline/util.c (copia de trabajo)
@@ -55,7 +55,7 @@
{
if ((commit_info)
&& (SVN_IS_VALID_REVNUM (commit_info->revision)))
- printf ("\nCommitted revision %ld.\n",
+ printf (_("\nCommitted revision %ld.\n"),
commit_info->revision);
return;
Index: subversion/clients/cmdline/log-cmd.c
===================================================================
--- subversion/clients/cmdline/log-cmd.c (revision 9708)
+++ subversion/clients/cmdline/log-cmd.c (copia de trabajo)
@@ -285,7 +285,7 @@
(&path_stdout, log_item->copyfrom_path, pool));
copy_data
= apr_psprintf (pool,
- " (from %s:%ld)",
+ _(" (from %s:%ld)"),
path_stdout,
log_item->copyfrom_rev);
}
Index: subversion/clients/cmdline/propset-cmd.c
===================================================================
--- subversion/clients/cmdline/propset-cmd.c (revision 9708)
+++ subversion/clients/cmdline/propset-cmd.c (copia de trabajo)
@@ -33,6 +33,8 @@
#include "svn_subst.h"
#include "cl.h"
+#include "svn_private_config.h"
+
/*** Code. ***/
@@ -80,7 +82,7 @@
if (opt_state->encoding)
return svn_error_create
(SVN_ERR_UNSUPPORTED_FEATURE, NULL,
- "Bad encoding option: prop value not stored as UTF8");
+ _("Bad encoding option: prop value not stored as UTF8"));
/* Suck up all the remaining arguments into a targets array */
SVN_ERR (svn_opt_args_to_target_array (&targets, os,
@@ -109,12 +111,12 @@
which needs to be converted to a URL. */
if (targets->nelts <= 0)
return svn_error_create(SVN_ERR_CL_INSUFFICIENT_ARGS, NULL,
- "No URL target available");
+ _("No URL target available"));
target = ((const char **) (targets->elts))[0];
SVN_ERR (svn_client_url_from_path (&URL, target, pool));
if (URL == NULL)
return svn_error_create(SVN_ERR_UNVERSIONED_RESOURCE, NULL,
- "Either a URL or versioned item is required");
+ _("Either a URL or versioned item is required"));
/* Let libsvn_client do the real work. */
SVN_ERR (svn_client_revprop_set (pname_utf8, propval,
@@ -122,7 +124,7 @@
&rev, opt_state->force, ctx, pool));
if (! opt_state->quiet)
{
- printf ("property '%s' set on repository revision '%ld'\n",
+ printf (_("property '%s' set on repository revision '%ld'\n"),
pname, rev);
}
}
@@ -130,7 +132,7 @@
{
return svn_error_createf
(SVN_ERR_CL_ARG_PARSING_ERROR, NULL,
- "Cannot specify revision for setting versioned property '%s'",
+ _("Cannot specify revision for setting versioned property '%s'"),
pname);
}
else /* operate on a normal, versioned property (not a revprop) */
@@ -162,14 +164,14 @@
{
return svn_error_createf
(SVN_ERR_CL_INSUFFICIENT_ARGS, NULL,
- "Explicit target required ('%s' interpreted as prop value)",
+ _("Explicit target required ('%s' interpreted as prop value)"),
propval->data);
}
else
{
return svn_error_create
(SVN_ERR_CL_INSUFFICIENT_ARGS, NULL,
- "Explicit target argument required");
+ _("Explicit target argument required"));
}
}
@@ -190,9 +192,9 @@
pname_utf8, subpool));
SVN_ERR (svn_cmdline_path_local_style_from_utf8
(&target_stdout, target, subpool));
- printf ("property '%s' set%s on '%s'\n",
+ printf (_("property '%s' set%s on '%s'\n"),
pname_stdout,
- opt_state->recursive ? " (recursively)" : "",
+ opt_state->recursive ? _(" (recursively)") : "",
target_stdout);
}
}
Index: subversion/clients/cmdline/notify.c
===================================================================
--- subversion/clients/cmdline/notify.c (revision 9708)
+++ subversion/clients/cmdline/notify.c (copia de trabajo)
@@ -114,7 +114,7 @@
do get it, and the mime-type is not textual, note that this
is a binary addition. */
if (mime_type && (svn_mime_type_is_binary (mime_type)))
- printf ("A (bin) %s\n", path_stdout);
+ printf (_("A (bin) %s\n"), path_stdout);
else
printf ("A %s\n", path_stdout);
break;
@@ -180,19 +180,19 @@
if (nb->is_export)
{
if (nb->in_external)
- printf ("Exported external at revision %ld.\n",
+ printf (_("Exported external at revision %ld.\n"),
revision);
else
- printf ("Exported revision %ld.\n",
+ printf (_("Exported revision %ld.\n"),
revision);
}
else if (nb->is_checkout)
{
if (nb->in_external)
- printf ("Checked out external at revision %ld.\n",
+ printf (_("Checked out external at revision %ld.\n"),
revision);
else
- printf ("Checked out revision %ld.\n",
+ printf (_("Checked out revision %ld.\n"),
revision);
}
else
@@ -200,19 +200,19 @@
if (nb->received_some_change)
{
if (nb->in_external)
- printf ("Updated external to revision %ld.\n",
+ printf (_("Updated external to revision %ld.\n"),
revision);
else
- printf ("Updated to revision %ld.\n",
+ printf (_("Updated to revision %ld.\n"),
revision);
}
else
{
if (nb->in_external)
- printf ("External at revision %ld.\n",
+ printf (_("External at revision %ld.\n"),
revision);
else
- printf ("At revision %ld.\n",
+ printf (_("At revision %ld.\n"),
revision);
}
}
@@ -225,16 +225,16 @@
else if (nb->is_checkout)
{
if (nb->in_external)
- printf ("External checkout complete.\n");
+ printf (_("External checkout complete.\n"));
else
- printf ("Checkout complete.\n");
+ printf (_("Checkout complete.\n"));
}
else
{
if (nb->in_external)
- printf ("External update complete.\n");
+ printf (_("External update complete.\n"));
else
- printf ("Update complete.\n");
+ printf (_("Update complete.\n"));
}
}
}
@@ -251,7 +251,7 @@
case svn_wc_notify_status_completed:
if (SVN_IS_VALID_REVNUM (revision))
- printf ("Status against revision: %6ld\n", revision);
+ printf (_("Status against revision: %6ld\n"), revision);
break;
case svn_wc_notify_commit_modified:
@@ -260,13 +260,13 @@
case svn_wc_notify_commit_added:
if (mime_type && svn_mime_type_is_binary (mime_type))
- printf ("Adding (bin) %s\n", path_stdout);
+ printf (_("Adding (bin) %s\n"), path_stdout);
else
- printf ("Adding %s\n", path_stdout);
+ printf (_("Adding %s\n"), path_stdout);
break;
case svn_wc_notify_commit_deleted:
- printf ("Deleting %s\n", path_stdout);
+ printf (_("Deleting %s\n"), path_stdout);
break;
case svn_wc_notify_commit_replaced:
Index: subversion/clients/cmdline/proplist-cmd.c
===================================================================
--- subversion/clients/cmdline/proplist-cmd.c (revision 9708)
+++ subversion/clients/cmdline/proplist-cmd.c (copia de trabajo)
@@ -32,6 +32,8 @@
#include "svn_path.h"
#include "cl.h"
+#include "svn_private_config.h"
+
/*** Code. ***/
@@ -73,19 +75,19 @@
which needs to be converted to a URL. */
if (targets->nelts <= 0)
return svn_error_create(SVN_ERR_CL_INSUFFICIENT_ARGS, NULL,
- "No URL target available");
+ _("No URL target available"));
target = ((const char **) (targets->elts))[0];
SVN_ERR (svn_client_url_from_path (&URL, target, pool));
if (URL == NULL)
return svn_error_create(SVN_ERR_UNVERSIONED_RESOURCE, NULL,
- "Either a URL or versioned item is required");
+ _("Either a URL or versioned item is required"));
/* Let libsvn_client do the real work. */
SVN_ERR (svn_client_revprop_list (&proplist,
URL, &(opt_state->start_revision),
&rev, ctx, pool));
- printf("Unversioned properties on revision %ld:\n",
+ printf(_("Unversioned properties on revision %ld:\n"),
rev);
SVN_ERR (svn_cl__print_prop_hash
@@ -140,7 +142,7 @@
(&name_stdout, item->node_name->data, subpool));
}
- printf("Properties on '%s':\n", name_stdout);
+ printf(_("Properties on '%s':\n"), name_stdout);
SVN_ERR (svn_cl__print_prop_hash
(item->prop_hash, (! opt_state->verbose), subpool));
}
Index: subversion/clients/cmdline/propedit-cmd.c
===================================================================
--- subversion/clients/cmdline/propedit-cmd.c (revision 9708)
+++ subversion/clients/cmdline/propedit-cmd.c (copia de trabajo)
@@ -34,6 +34,8 @@
#include "svn_subst.h"
#include "cl.h"
+#include "svn_private_config.h"
+
/*** Code. ***/
@@ -85,12 +87,12 @@
which needs to be converted to a URL. */
if (targets->nelts <= 0)
return svn_error_create(SVN_ERR_CL_INSUFFICIENT_ARGS, NULL,
- "No URL target available");
+ _("No URL target available"));
target = ((const char **) (targets->elts))[0];
SVN_ERR (svn_client_url_from_path (&URL, target, pool));
if (URL == NULL)
return svn_error_create(SVN_ERR_UNVERSIONED_RESOURCE, NULL,
- "Either a URL or versioned item is required");
+ _("Either a URL or versioned item is required"));
/* Fetch the current property. */
SVN_ERR (svn_client_revprop_get (pname_utf8, &propval,
@@ -122,25 +124,25 @@
if (opt_state->encoding)
return svn_error_create
(SVN_ERR_UNSUPPORTED_FEATURE, NULL,
- "Bad encoding option: prop's value isn't stored as UTF8");
+ _("Bad encoding option: prop's value isn't stored as UTF8"));
SVN_ERR (svn_client_revprop_set (pname_utf8, propval,
URL, &(opt_state->start_revision),
&rev, opt_state->force, ctx, pool));
- printf ("Set new value for property '%s' on revision %ld\n",
+ printf (_("Set new value for property '%s' on revision %ld\n"),
pname, rev);
}
else
{
- printf ("No changes to property '%s' on revision %ld", pname, rev);
+ printf (_("No changes to property '%s' on revision %ld"), pname, rev);
}
}
else if (opt_state->start_revision.kind != svn_opt_revision_unspecified)
{
return svn_error_createf
(SVN_ERR_CL_ARG_PARSING_ERROR, NULL,
- "Cannot specify revision for editing versioned property '%s'",
+ _("Cannot specify revision for editing versioned property '%s'"),
pname);
}
else /* operate on a normal, versioned property (not a revprop) */
@@ -166,7 +168,7 @@
{
return svn_error_create
(SVN_ERR_CL_INSUFFICIENT_ARGS, NULL,
- "Explicit target argument required");
+ _("Explicit target argument required"));
}
/* For each target, edit the property PNAME. */
@@ -191,8 +193,8 @@
instead of NULL to svn_client_propget() below. */
return svn_error_createf
(SVN_ERR_UNSUPPORTED_FEATURE, NULL,
- "Editing property on non-local target '%s' "
- "not yet supported", target);
+ _("Editing property on non-local target '%s' "
+ "not yet supported"), target);
}
/* Fetch the current property. */
@@ -214,7 +216,7 @@
if (! entry)
return svn_error_createf
(SVN_ERR_ENTRY_NOT_FOUND, NULL,
- "'%s' does not appear to be a working copy path", target);
+ _("'%s' does not appear to be a working copy path"), target);
if (entry->kind == svn_node_file)
svn_path_split (target, &base_dir, NULL, subpool);
@@ -247,16 +249,16 @@
if (opt_state->encoding)
return svn_error_create
(SVN_ERR_UNSUPPORTED_FEATURE, NULL,
- "Bad encoding option: prop value not stored as UTF8");
+ _("Bad encoding option: prop value not stored as UTF8"));
SVN_ERR (svn_client_propset (pname_utf8, propval, target,
FALSE, subpool));
- printf ("Set new value for property '%s' on '%s'\n",
+ printf (_("Set new value for property '%s' on '%s'\n"),
pname, target_stdout);
}
else
{
- printf ("No changes to property '%s' on '%s'\n",
+ printf (_("No changes to property '%s' on '%s'\n"),
pname, target_stdout);
}
}
Index: subversion/clients/cmdline/info-cmd.c
===================================================================
--- subversion/clients/cmdline/info-cmd.c (revision 9708)
+++ subversion/clients/cmdline/info-cmd.c (copia de trabajo)
@@ -93,7 +93,7 @@
}
if (SVN_IS_VALID_REVNUM (entry->revision))
- printf ("Revision: %ld\n", entry->revision);
+ printf (_("Revision: %ld\n"), entry->revision);
switch (entry->kind)
{
@@ -168,7 +168,7 @@
}
if (SVN_IS_VALID_REVNUM (entry->cmt_rev))
- printf ("Last Changed Rev: %ld\n", entry->cmt_rev);
+ printf (_("Last Changed Rev: %ld\n"), entry->cmt_rev);
if (entry->cmt_date)
SVN_ERR (svn_cl__info_print_time (entry->cmt_date,
Index: subversion/svndumpfilter/main.c
===================================================================
--- subversion/svndumpfilter/main.c (revision 9708)
+++ subversion/svndumpfilter/main.c (copia de trabajo)
@@ -33,6 +33,8 @@
#include "svn_pools.h"
#include "svn_sorts.h"
+#include "svn_private_config.h"
+
/*** Code. ***/
@@ -635,14 +637,14 @@
SVN_ERR (svn_stream_write (rb->pb->out_stream,
rb->body->data , &(rb->body->len)));
if (! rb->pb->quiet)
- fprintf (stderr, "Revision %ld committed as %ld.\n",
+ fprintf (stderr, _("Revision %ld committed as %ld.\n"),
rb->rev_orig, rb->rev_actual);
}
else
{
rb->pb->rev_drop_count++;
if (! rb->pb->quiet)
- fprintf (stderr, "Revision %ld skipped.\n",
+ fprintf (stderr, _("Revision %ld skipped.\n"),
rb->rev_orig);
}
return SVN_NO_ERROR;
@@ -885,11 +887,11 @@
&this_key,
sizeof (this_key)));
if (this_val == SVN_INVALID_REVNUM)
- fprintf (stderr, " '%ld' => (dropped)\n",
+ fprintf (stderr, _(" '%ld' => (dropped)\n"),
this_key);
else
fprintf (stderr,
- " '%ld' => '%ld'\n",
+ _(" '%ld' => '%ld'\n"),
this_key, this_val);
}
fprintf (stderr, "\n");
Index: subversion/libsvn_fs_fs/fs_fs.c
===================================================================
--- subversion/libsvn_fs_fs/fs_fs.c (revision 9708)
+++ subversion/libsvn_fs_fs/fs_fs.c (copia de trabajo)
@@ -95,7 +95,7 @@
else if (eof)
/* Any other circumstance is a genuine error. */
return svn_error_create (SVN_ERR_FS_CORRUPT, NULL,
- "Premature EOF when reading hash.");
+ _("Premature EOF when reading hash."));
first_time = 0;
@@ -367,8 +367,8 @@
{
if (header_str[i] == '\0')
return svn_error_create (SVN_ERR_FS_CORRUPT, NULL,
- "Found malformed header in "
- "revision file");
+ _("Found malformed header in "
+ "revision file"));
i++;
}
@@ -381,8 +381,8 @@
if (i > header_len)
return svn_error_create (SVN_ERR_FS_CORRUPT, NULL,
- "Found malformed header in "
- "revision file");
+ _("Found malformed header in "
+ "revision file"));
value = header_str + i;
@@ -543,7 +543,7 @@
str = apr_strtok (string, " ", &last_str);
if (str == NULL)
return svn_error_create (SVN_ERR_FS_CORRUPT, NULL,
- "Malformed text rep offset line in node-rev");
+ _("Malformed text rep offset line in node-rev"));
rep->revision = atoi (str);
@@ -553,21 +553,21 @@
str = apr_strtok (NULL, " ", &last_str);
if (str == NULL)
return svn_error_create (SVN_ERR_FS_CORRUPT, NULL,
- "Malformed text rep offset line in node-rev");
+ _("Malformed text rep offset line in node-rev"));
rep->offset = apr_atoi64 (str);
str = apr_strtok (NULL, " ", &last_str);
if (str == NULL)
return svn_error_create (SVN_ERR_FS_CORRUPT, NULL,
- "Malformed text rep offset line in node-rev");
+ _("Malformed text rep offset line in node-rev"));
rep->size = apr_atoi64 (str);
str = apr_strtok (NULL, " ", &last_str);
if (str == NULL)
return svn_error_create (SVN_ERR_FS_CORRUPT, NULL,
- "Malformed text rep offset line in node-rev");
+ _("Malformed text rep offset line in node-rev"));
rep->expanded_size = apr_atoi64 (str);
@@ -575,14 +575,14 @@
str = apr_strtok (NULL, " ", &last_str);
if ((str == NULL) || (strlen (str) != (APR_MD5_DIGESTSIZE * 2)))
return svn_error_create (SVN_ERR_FS_CORRUPT, NULL,
- "Malformed text rep offset line in node-rev");
+ _("Malformed text rep offset line in node-rev"));
/* Parse the hex MD5 hash into digest form. */
for (i = 0; i < APR_MD5_DIGESTSIZE; i++)
{
if ((! isxdigit (str[i * 2])) || (! isxdigit (str[i * 2 + 1])))
return svn_error_create (SVN_ERR_FS_CORRUPT, NULL,
- "Malformed text rep offset line in node-rev");
+ _("Malformed text rep offset line in node-rev"));
str[i * 2] = tolower (str[i * 2]);
rep->checksum[i] = (str[i * 2] -
@@ -682,7 +682,7 @@
if ((value == NULL) ||
(strcmp (value, SVN_FS_FS__FILE) != 0 && strcmp (value, SVN_FS_FS__DIR)))
return svn_error_create (SVN_ERR_FS_CORRUPT, NULL,
- "Missing kind field in node-rev.");
+ _("Missing kind field in node-rev."));
if (strcmp (value, SVN_FS_FS__FILE) == 0)
{
@@ -728,7 +728,7 @@
if (value == NULL)
{
return svn_error_create (SVN_ERR_FS_CORRUPT, NULL,
- "Missing cpath in node-rev");
+ _("Missing cpath in node-rev"));
}
else
{
@@ -755,13 +755,13 @@
str = apr_strtok (value, " ", &last_str);
if (str == NULL)
return svn_error_create (SVN_ERR_FS_CORRUPT, NULL,
- "Malformed copyroot line in node-rev");
+ _("Malformed copyroot line in node-rev"));
noderev->copyroot_rev = atoi (str);
if (last_str == NULL)
return svn_error_create (SVN_ERR_FS_CORRUPT, NULL,
- "Malformed copyroot line in node-rev");
+ _("Malformed copyroot line in node-rev"));
noderev->copyroot_path = apr_pstrdup (pool, last_str);
}
@@ -779,13 +779,13 @@
str = apr_strtok (value, " ", &last_str);
if (str == NULL)
return svn_error_create (SVN_ERR_FS_CORRUPT, NULL,
- "Malformed copyfrom line in node-rev");
+ _("Malformed copyfrom line in node-rev"));
noderev->copyfrom_rev = atoi (str);
if (last_str == NULL)
return svn_error_create (SVN_ERR_FS_CORRUPT, NULL,
- "Malformed copyfrom line in node-rev");
+ _("Malformed copyfrom line in node-rev"));
noderev->copyfrom_path = apr_pstrdup (pool, last_str);
}
@@ -882,7 +882,7 @@
if (! svn_fs_fs__id_txn_id (id))
return svn_error_create (SVN_ERR_FS_CORRUPT, NULL,
- "Attempted to write to non-transaction.");
+ _("Attempted to write to non-transaction."));
/* Write out the new node-rev file in this transaction. */
dirname = svn_path_join_many (pool, fs->path, SVN_FS_FS__TXNS_DIR,
@@ -975,7 +975,7 @@
err:
return svn_error_create (SVN_ERR_FS_CORRUPT, NULL,
- "Malformed representation header.");
+ _("Malformed representation header."));
}
/* Given a revision file REV_FILE, find the Node-ID of the header
@@ -1000,13 +1000,13 @@
if (node_id_str == NULL)
return svn_error_create (SVN_ERR_FS_CORRUPT, NULL,
- "Missing node-id in node-rev");
+ _("Missing node-id in node-rev"));
id = svn_fs_fs__id_parse (node_id_str, strlen (node_id_str), pool);
if (id == NULL)
return svn_error_create (SVN_ERR_FS_CORRUPT, NULL,
- "Corrupt node-id in node-rev");
+ _("Corrupt node-id in node-rev"));
*id_p = id;
@@ -1051,7 +1051,7 @@
if (buf[num_bytes - 1] != '\n')
{
return svn_error_createf (SVN_ERR_FS_CORRUPT, NULL,
- "Revision file lacks trailing newline.");
+ _("Revision file lacks trailing newline."));
}
/* Look for the next previous newline. */
@@ -1063,8 +1063,8 @@
if (i < 0)
{
return svn_error_createf (SVN_ERR_FS_CORRUPT, NULL,
- "Final line in revision file longer than 64 "
- "characters.");
+ _("Final line in revision file longer than 64 "
+ "characters."));
}
if (root_offset)
@@ -1076,7 +1076,7 @@
if (i == (num_bytes - 2))
return svn_error_create (SVN_ERR_FS_CORRUPT, NULL,
- "Final line in revision file missing space.");
+ _("Final line in revision file missing space."));
i++;
@@ -1235,7 +1235,7 @@
SVN_ERR (svn_io_file_read_full (file, buf, 4, NULL, pool));
if (! ((buf[0] == 'S') && (buf[1] == 'V') && (buf[2] == 'N')))
return svn_error_create (SVN_ERR_FS_CORRUPT, NULL,
- "Malformed svndiff data in representation.");
+ _("Malformed svndiff data in representation."));
rs->ver = buf[3];
rs->chunk_index = 0;
rs->off += 4;
@@ -1339,8 +1339,8 @@
SVN_ERR (get_file_offset (&rs->off, rs->file, pool));
if (rs->off > rs->end)
return svn_error_create (SVN_ERR_FS_CORRUPT, NULL,
- "Reading one svndiff window read beyond the end "
- "of the representation.");
+ _("Reading one svndiff window read beyond the end "
+ "of the representation."));
/* Combine in the windows from the other delta reps, if needed. */
for (i = 1; i < rb->rs_list->nelts; i++)
@@ -1359,8 +1359,9 @@
SVN_ERR (svn_io_file_seek (rs->file, APR_CUR, &rs->off, pool));
if (rs->off >= rs->end)
return svn_error_create (SVN_ERR_FS_CORRUPT, NULL,
- "Reading one svndiff window read beyond "
- "the end of the representation.");
+ _("Reading one svndiff window read "
+ "beyond the end of the "
+ "representation."));
}
/* Read the next window. */
@@ -1371,8 +1372,8 @@
if (rs->off > rs->end)
return svn_error_create (SVN_ERR_FS_CORRUPT, NULL,
- "Reading one svndiff window read beyond "
- "the end of the representation.");
+ _("Reading one svndiff window read beyond "
+ "the end of the representation."));
/* Combine this window with the current one. Cycles pools so that we
only need to hold three windows at a time. */
@@ -1462,14 +1463,14 @@
{
if (! rb->src_state)
return svn_error_create (SVN_ERR_FS_CORRUPT, NULL,
- "svndiff data requested "
- "non-existant source.");
+ _("svndiff data requested "
+ "non-existant source."));
rs = rb->src_state;
sbuf = apr_pcalloc (rb->pool, window->sview_len);
if (! ((rs->start + window->sview_offset) < rs->end))
return svn_error_create (SVN_ERR_FS_CORRUPT, NULL,
- "svndiff requested position beyond "
- "end of stream.");
+ _("svndiff requested position beyond "
+ "end of stream."));
if ((rs->start + window->sview_offset) != rs->off)
{
rs->off = rs->start + window->sview_offset;
@@ -1490,7 +1491,7 @@
&rb->buf_len);
if (rb->buf_len != window->tview_len)
return svn_error_create (SVN_ERR_FS_CORRUPT, NULL,
- "svndiff window length is corrupt.");
+ _("svndiff window length is corrupt."));
rb->buf_pos = 0;
}
}
@@ -1582,7 +1583,7 @@
str = apr_strtok (str_val, " ", &last_str);
if (str == NULL)
return svn_error_create (SVN_ERR_FS_CORRUPT, NULL,
- "Directory entry corrupt");
+ _("Directory entry corrupt"));
if (strcmp (str, SVN_FS_FS__FILE) == 0)
{
@@ -1595,13 +1596,13 @@
else
{
return svn_error_create (SVN_ERR_FS_CORRUPT, NULL,
- "Directory entry corrupt");
+ _("Directory entry corrupt"));
}
str = apr_strtok (NULL, " ", &last_str);
if (str == NULL)
return svn_error_create (SVN_ERR_FS_CORRUPT, NULL,
- "Directory entry corrupt");
+ _("Directory entry corrupt"));
dirent->id = svn_fs_fs__id_parse (str, strlen (str), pool);
@@ -1728,7 +1729,7 @@
if ((! change->noderev_id) && (change->kind != svn_fs_path_change_reset))
return svn_error_create
(SVN_ERR_FS_CORRUPT, NULL,
- "Missing required node revision ID");
+ _("Missing required node revision ID"));
/* Sanity check: we should be talking about the same node
revision ID as our last change except where the last change
@@ -1738,8 +1739,8 @@
&& (old_change->change_kind != svn_fs_path_change_delete))
return svn_error_create
(SVN_ERR_FS_CORRUPT, NULL,
- "Invalid change ordering: new node revision ID "
- "without delete");
+ _("Invalid change ordering: new node revision ID "
+ "without delete"));
/* Sanity check: an add, replacement, or reset must be the first
thing to follow a deletion. */
@@ -1749,7 +1750,7 @@
|| (change->kind == svn_fs_path_change_add))))
return svn_error_create
(SVN_ERR_FS_CORRUPT, NULL,
- "Invalid change ordering: non-add change on deleted path");
+ _("Invalid change ordering: non-add change on deleted path"));
/* Now, merge that change in. */
switch (change->kind)
@@ -1894,7 +1895,7 @@
str = apr_strtok (buf, " ", &last_str);
if (str == NULL)
return svn_error_create (SVN_ERR_FS_CORRUPT, NULL,
- "Invalid changes line in rev-file");
+ _("Invalid changes line in rev-file"));
change->noderev_id = svn_fs_fs__id_parse (str, strlen (str), pool);
@@ -1902,7 +1903,7 @@
str = apr_strtok (NULL, " ", &last_str);
if (str == NULL)
return svn_error_create (SVN_ERR_FS_CORRUPT, NULL,
- "Invalid changes line in rev-file");
+ _("Invalid changes line in rev-file"));
if (strcmp (str, SVN_FS_FS__ACTION_MODIFY) == 0)
{
@@ -1927,14 +1928,14 @@
else
{
return svn_error_create (SVN_ERR_FS_CORRUPT, NULL,
- "Invalid change kind in rev file");
+ _("Invalid change kind in rev file"));
}
/* Get the text-mod flag. */
str = apr_strtok (NULL, " ", &last_str);
if (str == NULL)
return svn_error_create (SVN_ERR_FS_CORRUPT, NULL,
- "Invalid changes line in rev-file");
+ _("Invalid changes line in rev-file"));
if (strcmp (str, SVN_FS_FS__TRUE) == 0)
{
@@ -1947,14 +1948,14 @@
else
{
return svn_error_create (SVN_ERR_FS_CORRUPT, NULL,
- "Invalid text-mod flag in rev-file");
+ _("Invalid text-mod flag in rev-file"));
}
/* Get the prop-mod flag. */
str = apr_strtok (NULL, " ", &last_str);
if (str == NULL)
return svn_error_create (SVN_ERR_FS_CORRUPT, NULL,
- "Invalid changes line in rev-file");
+ _("Invalid changes line in rev-file"));
if (strcmp (str, SVN_FS_FS__TRUE) == 0)
{
@@ -1967,7 +1968,7 @@
else
{
return svn_error_create (SVN_ERR_FS_CORRUPT, NULL,
- "Invalid prop-mod flag in rev-file");
+ _("Invalid prop-mod flag in rev-file"));
}
/* Get the changed path. */
@@ -1987,12 +1988,12 @@
str = apr_strtok (buf, " ", &last_str);
if (! str)
return svn_error_create (SVN_ERR_FS_CORRUPT, NULL,
- "Invalid changes line in rev-file");
+ _("Invalid changes line in rev-file"));
change->copyfrom_rev = atol (str);
if (! last_str)
return svn_error_create (SVN_ERR_FS_CORRUPT, NULL,
- "Invalid changes line in rev-file");
+ _("Invalid changes line in rev-file"));
change->copyfrom_path = apr_pstrdup (pool, last_str);
}
@@ -2158,7 +2159,7 @@
if (svn_fs_fs__id_txn_id (noderev->id))
return svn_error_create (SVN_ERR_FS_CORRUPT, NULL,
- "Copying from transactions not allowed.");
+ _("Copying from transactions not allowed."));
noderev->predecessor_id = noderev->id;
noderev->predecessor_count++;
@@ -2420,14 +2421,14 @@
str = apr_strtok (buf, " ", &last_str);
if (! str)
return svn_error_create (SVN_ERR_FS_CORRUPT, NULL,
- "next-id file corrupt");
+ _("next-id file corrupt"));
*node_id = apr_pstrdup (pool, str);
str = apr_strtok (NULL, " ", &last_str);
if (! str)
return svn_error_create (SVN_ERR_FS_CORRUPT, NULL,
- "next-id file corrupt");
+ _("next-id file corrupt"));
*copy_id = apr_pstrdup (pool, str);
@@ -2644,7 +2645,7 @@
break;
default:
return svn_error_create (SVN_ERR_FS_CORRUPT, NULL,
- "Invalid change type.");
+ _("Invalid change type."));
}
if (change->node_rev_id)
@@ -3042,7 +3043,7 @@
if (! svn_fs_fs__id_txn_id (noderev->id))
return svn_error_create (SVN_ERR_FS_CORRUPT, NULL,
- "Attempted to write to non-transaction.");
+ _("Attempted to write to non-transaction."));
SVN_ERR (rep_write_get_baton (&wb, fs, noderev, is_data_rep, pool));
@@ -3137,19 +3138,19 @@
str = apr_strtok (buf, " ", &last_str);
if (! str)
return svn_error_create (SVN_ERR_FS_CORRUPT, NULL,
- "Corrupt current file.");
+ _("Corrupt current file."));
str = apr_strtok (NULL, " ", &last_str);
if (! str)
return svn_error_create (SVN_ERR_FS_CORRUPT, NULL,
- "Corrupt current file.");
+ _("Corrupt current file."));
*node_id = apr_pstrdup (pool, str);
str = apr_strtok (NULL, " ", &last_str);
if (! str)
return svn_error_create (SVN_ERR_FS_CORRUPT, NULL,
- "Corrupt current file.");
+ _("Corrupt current file."));
*copy_id = apr_pstrdup (pool, str);
@@ -3433,10 +3434,10 @@
/* Match the perms on the old file to the perms reference file. */
status = apr_stat (&finfo, perms_reference, APR_FINFO_PROT, pool);
if (! APR_STATUS_IS_SUCCESS (status))
- return svn_error_wrap_apr (status, "Can't stat '%s'", perms_reference);
+ return svn_error_wrap_apr (status, _("Can't stat '%s'"), perms_reference);
status = apr_file_perms_set (old_filename, finfo.protection);
if (! APR_STATUS_IS_SUCCESS (status))
- return svn_error_wrap_apr (status, "Can't chmod '%s'", old_filename);
+ return svn_error_wrap_apr (status, _("Can't chmod '%s'"), old_filename);
#endif
/* Move the file into place. */
@@ -3570,7 +3571,7 @@
{
svn_pool_destroy (subpool);
return svn_error_create (SVN_ERR_FS_TXN_OUT_OF_DATE, NULL,
- "Transaction out of date.");
+ _("Transaction out of date."));
}
/* Get the next node_id and copy_id to use. */
@@ -3862,7 +3863,7 @@
/* Did we find it? */
if (kind != svn_node_dir)
return svn_error_create (SVN_ERR_FS_NO_SUCH_TRANSACTION, NULL,
- "No such transaction.");
+ _("No such transaction."));
txn = apr_pcalloc (pool, sizeof (*txn));
Index: subversion/libsvn_fs_fs/err.c
===================================================================
--- subversion/libsvn_fs_fs/err.c (revision 9708)
+++ subversion/libsvn_fs_fs/err.c (copia de trabajo)
@@ -36,7 +36,7 @@
return SVN_NO_ERROR;
else
return svn_error_create (SVN_ERR_FS_NOT_OPEN, 0,
- "filesystem object has not been opened yet");
+ _("filesystem object has not been opened yet"));
}
@@ -57,7 +57,7 @@
svn_fs_fs__err_corrupt_node_revision (svn_fs_t *fs, const svn_fs_id_t *id)
{
return
- corrupt_id ("Corrupt node revision for node '%s' in filesystem '%s'",
+ corrupt_id (_("Corrupt node revision for node '%s' in filesystem '%s'"),
id, fs);
}
@@ -67,7 +67,7 @@
{
return svn_error_createf
(SVN_ERR_FS_CORRUPT, 0,
- "Corrupt filesystem revision '%ld' in filesystem '%s'",
+ _("Corrupt filesystem revision '%ld' in filesystem '%s'"),
rev, fs->path);
}
@@ -80,7 +80,7 @@
return
svn_error_createf
(SVN_ERR_FS_CORRUPT, 0,
- "Corrupt clone record for '%s' in transaction '%s' in filesystem '%s'",
+ _("Corrupt clone record for '%s' in transaction '%s' in filesystem '%s'"),
base_path, svn_txn, fs->path);
}
@@ -89,7 +89,7 @@
svn_fs_fs__err_corrupt_id (svn_fs_t *fs, const svn_fs_id_t *id)
{
return
- corrupt_id ("Corrupt node revision id '%s' appears in filesystem '%s'",
+ corrupt_id (_("Corrupt node revision id '%s' appears in filesystem '%s'"),
id, fs);
}
@@ -100,7 +100,7 @@
svn_string_t *id_str = svn_fs_fs__id_unparse (id, fs->pool);
return svn_error_createf
(SVN_ERR_FS_ID_NOT_FOUND, 0,
- "Reference to non-existent node '%s' in filesystem '%s'",
+ _("Reference to non-existent node '%s' in filesystem '%s'"),
id_str->data, fs->path);
}
@@ -110,7 +110,7 @@
{
return svn_error_createf
(SVN_ERR_FS_NO_SUCH_REVISION, 0,
- "Reference to non-existent revision '%ld' in filesystem '%s'",
+ _("Reference to non-existent revision '%ld' in filesystem '%s'"),
rev, fs->path);
}
@@ -121,7 +121,7 @@
return
svn_error_createf
(SVN_ERR_FS_CORRUPT, 0,
- "Malformed ID as key in 'nodes' table of filesystem '%s'", fs->path);
+ _("Malformed ID as key in 'nodes' table of filesystem '%s'"), fs->path);
}
@@ -131,7 +131,7 @@
return
svn_error_createf
(SVN_ERR_FS_CORRUPT, 0,
- "Corrupt value for 'next-id' key in '%s' table of filesystem '%s'",
+ _("Corrupt value for 'next-id' key in '%s' table of filesystem '%s'"),
table, fs->path);
}
@@ -143,8 +143,8 @@
return
svn_error_createf
(SVN_ERR_FS_CORRUPT, 0,
- "Corrupt entry in 'transactions' table for '%s'"
- " in filesystem '%s'", txn, fs->path);
+ _("Corrupt entry in 'transactions' table for '%s'"
+ " in filesystem '%s'"), txn, fs->path);
}
@@ -154,7 +154,7 @@
return
svn_error_createf
(SVN_ERR_FS_CORRUPT, 0,
- "Corrupt entry in 'copies' table for '%s' in filesystem '%s'",
+ _("Corrupt entry in 'copies' table for '%s' in filesystem '%s'"),
copy_id, fs->path);
}
@@ -165,7 +165,7 @@
return
svn_error_createf
(SVN_ERR_FS_NOT_MUTABLE, 0,
- "File is not mutable: filesystem '%s', revision %ld, path '%s'",
+ _("File is not mutable: filesystem '%s', revision %ld, path '%s'"),
fs->path, rev, path);
}
@@ -176,7 +176,7 @@
return
svn_error_createf
(SVN_ERR_FS_PATH_SYNTAX, 0,
- "Search for malformed path '%s' in filesystem '%s'",
+ _("Search for malformed path '%s' in filesystem '%s'"),
path, fs->path);
}
@@ -187,7 +187,7 @@
return
svn_error_createf
(SVN_ERR_FS_NO_SUCH_TRANSACTION, 0,
- "No transaction named '%s' in filesystem '%s'",
+ _("No transaction named '%s' in filesystem '%s'"),
txn, fs->path);
}
@@ -198,7 +198,7 @@
return
svn_error_createf
(SVN_ERR_FS_TRANSACTION_NOT_MUTABLE, 0,
- "Cannot modify transaction named '%s' in filesystem '%s'",
+ _("Cannot modify transaction named '%s' in filesystem '%s'"),
txn, fs->path);
}
@@ -209,7 +209,7 @@
return
svn_error_createf
(SVN_ERR_FS_NO_SUCH_COPY, 0,
- "No copy with id '%s' in filesystem '%s'", copy_id, fs->path);
+ _("No copy with id '%s' in filesystem '%s'"), copy_id, fs->path);
}
@@ -219,6 +219,6 @@
return
svn_error_createf
(SVN_ERR_FS_NOT_DIRECTORY, 0,
- "'%s' is not a directory in filesystem '%s'",
+ _("'%s' is not a directory in filesystem '%s'"),
path, fs->path);
}
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Fri May 14 04:45:57 2004