Here's another round of _()'s added everywhere.
Index: subversion/libsvn_wc/update_editor.c
===================================================================
--- subversion/libsvn_wc/update_editor.c (revision 9314)
+++ subversion/libsvn_wc/update_editor.c (working copy)
@@ -335,7 +335,7 @@
entry = apr_hash_get (entries, SVN_WC_ENTRY_THIS_DIR, APR_HASH_KEY_STRING);
if (! entry)
return svn_error_createf (SVN_ERR_ENTRY_NOT_FOUND, NULL,
- "No '.' entry in: '%s'", path);
+ _("No '.' entry in: '%s'"), path);
entry->incomplete = FALSE;
/* Remove any deleted or missing entries. */
@@ -779,7 +779,7 @@
return svn_error_createf
(SVN_ERR_WC_OBSTRUCTED_UPDATE, tmp_err,
- "Won't delete locally modified directory '%s'", path);
+ _("Won't delete locally modified directory '%s'"), path);
}
return err;
@@ -822,7 +822,7 @@
if (tmodified_p || pmodified_p)
return svn_error_createf
(SVN_ERR_WC_OBSTRUCTED_UPDATE, NULL,
- "Won't delete locally modified file '%s'",
+ _("Won't delete locally modified file '%s'"),
path);
}
@@ -875,7 +875,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,
@@ -979,15 +980,15 @@
if (kind != svn_node_none)
return svn_error_createf
(SVN_ERR_WC_OBSTRUCTED_UPDATE, NULL,
- "Failed to add directory '%s': object of the same name already exists",
- db->path);
+ _("Failed to add directory '%s': object of the same name "
+ "already exists"), db->path);
/* It may not be named the same as the administrative directory. */
if (strcmp (svn_path_basename (path, pool), SVN_WC_ADM_DIR_NAME) == 0)
return svn_error_createf
(SVN_ERR_WC_OBSTRUCTED_UPDATE, NULL,
- "Failed to add directory '%s': object of the same name as the "
- "administrative directory", db->path);
+ _("Failed to add directory '%s': object of the same name as the "
+ "administrative directory"), db->path);
/* Either we got real copyfrom args... */
if (copyfrom_path || SVN_IS_VALID_REVNUM (copyfrom_revision))
@@ -999,8 +1000,8 @@
copied tree. Someday! */
return svn_error_createf
(SVN_ERR_UNSUPPORTED_FEATURE, NULL,
- "Failed to add directory '%s': copyfrom arguments not yet supported",
- db->path);
+ _("Failed to add directory '%s': copyfrom arguments not "
+ "yet supported"), db->path);
}
else /* ...or we got invalid copyfrom args. */
{
@@ -1019,8 +1020,8 @@
if (dir_entry && dir_entry->schedule == svn_wc_schedule_add)
return svn_error_createf
(SVN_ERR_WC_OBSTRUCTED_UPDATE, NULL,
- "Failed to add dir '%s': object of the same name is already "
- "scheduled for addition", path);
+ _("Failed to add dir '%s': object of the same name is already "
+ "scheduled for addition"), path);
/* Immediately create an entry for the new directory in the parent.
Note that the parent must already be either added or opened, and
@@ -1224,7 +1225,7 @@
adm_access, NULL,
regular_props, TRUE, FALSE,
db->pool, &entry_accum),
- "Couldn't do property merge");
+ _("Couldn't do property merge"));
/* Are the directory's props locally modified? */
SVN_ERR (svn_wc_props_modified_p (&prop_modified,
@@ -1254,8 +1255,9 @@
/* Write our accumulation of log entries into a log file */
SVN_ERR_W (svn_io_file_write_full (log_fp, entry_accum->data,
entry_accum->len, NULL, pool),
- apr_psprintf (pool,
- "Error writing log file for '%s'", db->path));
+ apr_psprintf (pool,
+ _("Error writing log file for '%s'"),
+ db->path));
/* The log is ready to run, close it. */
SVN_ERR (svn_wc__close_adm_file (log_fp,
@@ -1314,8 +1316,8 @@
if (ent && (ent->schedule == svn_wc_schedule_add))
return svn_error_createf
(SVN_ERR_WC_OBSTRUCTED_UPDATE, NULL,
- "Failed to mark '%s' absent: item of the same name is already "
- "scheduled for addition", path);
+ _("Failed to mark '%s' absent: item of the same name is already "
+ "scheduled for addition"), path);
/* Immediately create an entry for the new item in the parent. Note
that the parent must already be either added or opened, and thus
@@ -1405,7 +1407,7 @@
if (adding && (kind != svn_node_none))
return svn_error_createf
(SVN_ERR_WC_OBSTRUCTED_UPDATE, NULL,
- "Failed to add file '%s': object of the same name already exists",
+ _("Failed to add file '%s': object of the same name already exists"),
fb->path);
/* sussman sez: If we're trying to add a file that's already in
@@ -1426,15 +1428,15 @@
if (adding && entry && entry->schedule == svn_wc_schedule_add)
return svn_error_createf
(SVN_ERR_WC_OBSTRUCTED_UPDATE, NULL,
- "Failed to add file '%s': object of the same name is already "
- "scheduled for addition", fb->path);
+ _("Failed to add file '%s': object of the same name is already "
+ "scheduled for addition"), fb->path);
/* If replacing, make sure the .svn entry already exists. */
if ((! adding) && (! entry))
return svn_error_createf (SVN_ERR_UNVERSIONED_RESOURCE, NULL,
- "File '%s' in directory '%s' "
- "is not a versioned resource",
+ _("File '%s' in directory '%s' "
+ "is not a versioned resource"),
fb->name, pb->path);
/* ### todo: right now the incoming copyfrom* args are being
@@ -1536,8 +1538,8 @@
if (strcmp (hex_digest, base_checksum) != 0)
return svn_error_createf
(SVN_ERR_WC_CORRUPT_TEXT_BASE, NULL,
- "Checksum mismatch for '%s'; expected: '%s', actual: '%s'",
- tb, base_checksum, hex_digest);
+ _("Checksum mismatch for '%s'; expected: '%s', "
+ "actual: '%s'"), tb, base_checksum, hex_digest);
}
if (strcmp (hex_digest, ent->checksum) != 0)
@@ -1553,8 +1555,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);
}
}
}
@@ -1844,7 +1846,7 @@
{
SVN_ERR_W (svn_io_file_rename (new_text_path, final_location,
pool),
- "Move failed");
+ _("Move failed"));
new_text_path = final_location;
}
@@ -2204,7 +2206,7 @@
/* Write our accumulation of log entries into a log file */
SVN_ERR_W (svn_io_file_write_full (log_fp, log_accum->data,
log_accum->len, NULL, pool),
- apr_psprintf (pool, "Error writing log for '%s'", file_path));
+ apr_psprintf (pool, _("Error writing log for '%s'"), file_path));
/* The log is ready to run. Close it and run it! */
SVN_ERR (svn_wc__close_adm_file (log_fp, parent_dir, SVN_WC__ADM_LOG,
@@ -2277,7 +2279,7 @@
if (real_sum && (strcmp (text_checksum, real_sum) != 0))
return svn_error_createf
(SVN_ERR_CHECKSUM_MISMATCH, NULL,
- "Checksum mismatch for '%s'; expected: '%s', actual: '%s'",
+ _("Checksum mismatch for '%s'; expected: '%s', actual: '%s'"),
fb->path, text_checksum, real_sum);
}
}
@@ -2653,7 +2655,7 @@
if (! entry)
return svn_error_createf
(SVN_ERR_UNVERSIONED_RESOURCE, NULL,
- "'%s' is not under version control", path);
+ _("'%s' is not under version control"), path);
if (kind)
*kind = entry->kind;
@@ -2680,7 +2682,7 @@
if (! p_entry->url)
return svn_error_createf
(SVN_ERR_ENTRY_MISSING_URL, NULL,
- "'%s' has no ancestry information.",
+ _("'%s' has no ancestry information."),
parent);
/* If PATH's parent in the WC is not its parent in the repository,
Index: subversion/libsvn_wc/questions.c
===================================================================
--- subversion/libsvn_wc/questions.c (revision 9314)
+++ subversion/libsvn_wc/questions.c (working copy)
@@ -38,6 +38,8 @@
#include "questions.h"
#include "entries.h"
+#include "svn_private_config.h"
+
#include "svn_md5.h"
#include <apr_md5.h>
@@ -58,7 +60,7 @@
if (kind == svn_node_none)
{
return svn_error_createf
- (APR_ENOENT, NULL, "'%s' does not exist", path);
+ (APR_ENOENT, NULL, _("'%s' does not exist"), path);
}
else if (kind != svn_node_dir)
*wc_format = 0;
@@ -99,16 +101,16 @@
{
return svn_error_createf
(SVN_ERR_WC_UNSUPPORTED_FORMAT, NULL,
- "Working copy format of '%s' is too old (%d); "
- "please check out your working copy again",
+ _("Working copy format of '%s' is too old (%d); "
+ "please check out your working copy again"),
path, wc_format);
}
else if (wc_format > SVN_WC__VERSION)
{
return svn_error_createf
(SVN_ERR_WC_UNSUPPORTED_FORMAT, NULL,
- "This client is too old to work with working copy '%s'; "
- "please get a newer Subversion client",
+ _("This client is too old to work with working copy '%s'; "
+ "please get a newer Subversion client"),
path);
}
@@ -166,7 +168,7 @@
if (entry == NULL)
return svn_error_createf
(SVN_ERR_ENTRY_NOT_FOUND, NULL,
- "'%s' is not under version control", path);
+ _("'%s' is not under version control"), path);
/* Get the timestamp from the working file and the entry */
if (timestamp_kind == svn_wc__text_time)
@@ -343,9 +345,9 @@
{
return svn_error_createf
(SVN_ERR_WC_CORRUPT_TEXT_BASE, NULL,
- "Checksum mismatch indicates corrupt text base: '%s'\n"
+ _("Checksum mismatch indicates corrupt text base: '%s'\n"
" expected: %s\n"
- " actual: %s\n",
+ " actual: %s\n"),
base_file, entry->checksum, checksum);
}
Index: subversion/libsvn_client/relocate.c
===================================================================
--- subversion/libsvn_client/relocate.c (revision 9314)
+++ subversion/libsvn_client/relocate.c (working copy)
@@ -30,6 +30,7 @@
#include "svn_path.h"
#include "client.h"
+#include "svn_private_config.h"
/*** Code. ***/
@@ -52,7 +53,7 @@
{
return svn_error_createf
(SVN_ERR_CLIENT_INVALID_RELOCATION, NULL,
- "The repository at '%s' has uuid '%s', but the WC has '%s'",
+ _("The repository at '%s' has uuid '%s', but the WC has '%s'"),
url, actual_uuid, expected_uuid);
}
Index: subversion/libsvn_client/switch.c
===================================================================
--- subversion/libsvn_client/switch.c (revision 9314)
+++ subversion/libsvn_client/switch.c (working copy)
@@ -33,6 +33,7 @@
#include "svn_config.h"
#include "client.h"
+#include "svn_private_config.h"
/*** Code. ***/
@@ -105,12 +106,12 @@
if (! entry)
return svn_error_createf
(SVN_ERR_UNVERSIONED_RESOURCE, NULL,
- "'%s' is not under version control", path);
+ _("'%s' is not under version control"), path);
if (! entry->url)
return svn_error_createf
(SVN_ERR_ENTRY_MISSING_URL, NULL,
- "Entry '%s' has no URL", path);
+ _("Entry '%s' has no URL"), path);
if (entry->kind == svn_node_file)
{
@@ -121,12 +122,12 @@
if (! session_entry)
return svn_error_createf
(SVN_ERR_UNVERSIONED_RESOURCE, NULL,
- "'%s' is not under version control", anchor);
+ _("'%s' is not under version control"), anchor);
if (! session_entry->url)
return svn_error_createf
(SVN_ERR_ENTRY_MISSING_URL, NULL,
- "Directory '%s' has no URL", anchor);
+ _("Directory '%s' has no URL"), anchor);
}
else if (entry->kind == svn_node_dir)
{
Index: subversion/libsvn_client/delete.c
===================================================================
--- subversion/libsvn_client/delete.c (revision 9314)
+++ subversion/libsvn_client/delete.c (working copy)
@@ -32,6 +32,7 @@
#include "svn_path.h"
#include "client.h"
+#include "svn_private_config.h"
/*** Code. ***/
@@ -58,11 +59,12 @@
/* Check for error-ful states. */
if (status->text_status == svn_wc_status_obstructed)
sb->err = svn_error_createf (SVN_ERR_NODE_UNEXPECTED_KIND, NULL,
- "'%s' is in the way of the resource "
- "actually under version control", path);
+ _("'%s' is in the way of the resource "
+ "actually under version control"), path);
else if (! status->entry)
sb->err = svn_error_createf (SVN_ERR_UNVERSIONED_RESOURCE, NULL,
- "'%s' is not under version control", path);
+ _("'%s' is not under version control"),
+ path);
else if ((status->text_status != svn_wc_status_normal
&& status->text_status != svn_wc_status_deleted
@@ -71,7 +73,7 @@
(status->prop_status != svn_wc_status_none
&& status->prop_status != svn_wc_status_normal))
sb->err = svn_error_createf (SVN_ERR_CLIENT_MODIFIED, NULL,
- "'%s' has local modifications", path);
+ _("'%s' has local modifications"), path);
}
Index: subversion/libsvn_client/export.c
===================================================================
--- subversion/libsvn_client/export.c (revision 9314)
+++ subversion/libsvn_client/export.c (working copy)
@@ -36,6 +36,8 @@
#include "svn_md5.h"
#include "client.h"
+#include "svn_private_config.h"
+
/*** Code. ***/
@@ -103,8 +105,8 @@
if (! APR_STATUS_IS_EEXIST (err->apr_err))
return err;
if (! force)
- SVN_ERR_W (err, "Destination directory exists, and will not be "
- "overwritten unless forced");
+ SVN_ERR_W (err, _("Destination directory exists, and will not be "
+ "overwritten unless forced"));
else
svn_error_clear (err);
}
@@ -282,10 +284,10 @@
SVN_ERR (svn_io_dir_make (path, APR_OS_DEFAULT, pool));
else if (kind == svn_node_file)
return svn_error_createf (SVN_ERR_WC_NOT_DIRECTORY, NULL,
- "'%s' exists and is not a directory", path);
+ _("'%s' exists and is not a directory"), path);
else if ((kind != svn_node_dir) || (! force))
return svn_error_createf (SVN_ERR_WC_OBSTRUCTED_UPDATE, NULL,
- "'%s' already exists", path);
+ _("'%s' already exists"), path);
if (notify_func)
(*notify_func) (notify_baton,
@@ -422,10 +424,11 @@
SVN_ERR (svn_io_dir_make (full_path, APR_OS_DEFAULT, pool));
else if (kind == svn_node_file)
return svn_error_createf (SVN_ERR_WC_NOT_DIRECTORY, NULL,
- "'%s' exists and is not a directory", full_path);
+ _("'%s' exists and is not a directory"),
+ full_path);
else if (! (kind == svn_node_dir && eb->force))
return svn_error_createf (SVN_ERR_WC_OBSTRUCTED_UPDATE, NULL,
- "'%s' already exists", full_path);
+ _("'%s' already exists"), full_path);
if (eb->notify_func)
(*eb->notify_func) (eb->notify_baton,
@@ -592,7 +595,7 @@
{
return svn_error_createf
(SVN_ERR_CHECKSUM_MISMATCH, NULL,
- "Checksum mismatch for '%s'; expected: '%s', actual: '%s'",
+ _("Checksum mismatch for '%s'; expected: '%s', actual: '%s'"),
fb->path, text_checksum, actual_checksum);
}
}
@@ -679,7 +682,7 @@
SVN_ERR (svn_client_url_from_path (&URL, from, pool));
if (! from)
return svn_error_createf (SVN_ERR_ENTRY_MISSING_URL, NULL,
- "'%s' has no URL", from);
+ _("'%s' has no URL"), from);
}
}
else
Index: subversion/libsvn_client/revisions.c
===================================================================
--- subversion/libsvn_client/revisions.c (revision 9314)
+++ subversion/libsvn_client/revisions.c (working copy)
@@ -28,6 +28,7 @@
#include "svn_path.h"
#include "client.h"
+#include "svn_private_config.h"
@@ -88,7 +89,7 @@
if (! ent)
return svn_error_createf
(SVN_ERR_UNVERSIONED_RESOURCE, NULL,
- "'%s' is not under version control", path);
+ _("'%s' is not under version control"), path);
if ((revision->kind == svn_opt_revision_base)
|| (revision->kind == svn_opt_revision_working))
@@ -103,7 +104,7 @@
else
return svn_error_createf
(SVN_ERR_CLIENT_BAD_REVISION, NULL,
- "Unrecognized revision type requested for '%s'", path);
+ _("Unrecognized revision type requested for '%s'"), path);
return SVN_NO_ERROR;
}
Index: subversion/libsvn_client/prop_commands.c
===================================================================
--- subversion/libsvn_client/prop_commands.c (revision 9314)
+++ subversion/libsvn_client/prop_commands.c (working copy)
@@ -31,6 +31,7 @@
#include "client.h"
#include "svn_path.h"
+#include "svn_private_config.h"
/*** Code. ***/
@@ -143,8 +144,8 @@
if (is_revision_prop_name (propname))
{
return svn_error_createf (SVN_ERR_CLIENT_PROPERTY_NAME, NULL,
- "Revision property '%s' not allowed "
- "in this context", propname);
+ _("Revision property '%s' not allowed "
+ "in this context"), propname);
}
if (svn_path_is_url (target))
@@ -153,20 +154,20 @@
if it's ever to support setting properties remotely. */
return svn_error_createf
(SVN_ERR_UNSUPPORTED_FEATURE, NULL,
- "Setting property on non-local target '%s' not yet supported",
+ _("Setting property on non-local target '%s' not yet supported"),
target);
}
if (propval && ! is_valid_prop_name (propname))
return svn_error_createf (SVN_ERR_CLIENT_PROPERTY_NAME, NULL,
- "Bad property name: '%s'", propname);
+ _("Bad property name: '%s'"), propname);
SVN_ERR (svn_wc_adm_probe_open2 (&adm_access, NULL, target, TRUE,
recurse ? -1 : 0, pool));
SVN_ERR (svn_wc_entry (&node, target, adm_access, FALSE, pool));
if (!node)
return svn_error_createf (SVN_ERR_UNVERSIONED_RESOURCE, NULL,
- "'%s' is not under version control",
+ _("'%s' is not under version control"),
target);
if (recurse && node->kind == svn_node_dir)
@@ -210,11 +211,11 @@
&& strchr (propval->data, '\n') != NULL
&& (! force))
return svn_error_create (SVN_ERR_CLIENT_REVISION_AUTHOR_CONTAINS_NEWLINE,
- NULL, "Value will not be set unless forced");
+ NULL, _("Value will not be set unless forced"));
if (propval && ! is_valid_prop_name (propname))
return svn_error_createf (SVN_ERR_CLIENT_PROPERTY_NAME, NULL,
- "Bad property name: '%s'", propname);
+ _("Bad property name: '%s'"), propname);
/* Open an RA session for the URL. Note that we don't have a local
directory, nor a place to put temp files. */
@@ -382,7 +383,7 @@
SVN_ERR (svn_wc_entry (&entry, target, adm_access, FALSE, pool));
if (! entry)
return svn_error_createf (SVN_ERR_UNVERSIONED_RESOURCE, NULL,
- "'%s' is not under version control",
+ _("'%s' is not under version control"),
target);
*new_target = entry->url;
}
@@ -436,7 +437,7 @@
{
return svn_error_createf
(SVN_ERR_NODE_UNKNOWN_KIND, NULL,
- "Unknown node kind for '%s'",
+ _("Unknown node kind for '%s'"),
svn_path_join (target_prefix, target_relative, pool));
}
@@ -539,8 +540,8 @@
{
return svn_error_createf
(SVN_ERR_ILLEGAL_TARGET, NULL,
- "'%s' is a URL, but revision kind requires a working copy",
- target);
+ _("'%s' is a URL, but revision kind requires a "
+ "working copy"), target);
}
/* target is a working copy path */
@@ -550,7 +551,7 @@
else
{
return svn_error_create
- (SVN_ERR_CLIENT_BAD_REVISION, NULL, "Unknown revision kind");
+ (SVN_ERR_CLIENT_BAD_REVISION, NULL, _("Unknown revision kind"));
}
SVN_ERR (ra_lib->check_path (session, "", revnum, &kind, pool));
@@ -568,7 +569,8 @@
SVN_ERR (svn_wc_entry (&node, target, adm_access, FALSE, pool));
if (! node)
return svn_error_createf (SVN_ERR_UNVERSIONED_RESOURCE, NULL,
- "'%s' is not under version control", target);
+ _("'%s' is not under version control"),
+ target);
SVN_ERR (svn_client__get_revision_number
(&revnum, NULL, NULL, revision, target, pool));
@@ -715,7 +717,7 @@
{
return svn_error_createf
(SVN_ERR_NODE_UNKNOWN_KIND, NULL,
- "Unknown node kind for '%s'",
+ _("Unknown node kind for '%s'"),
svn_path_join (target_prefix, target_relative, pool));
}
@@ -896,8 +898,8 @@
{
return svn_error_createf
(SVN_ERR_ILLEGAL_TARGET, NULL,
- "'%s' is a URL, but revision kind requires a working copy",
- target);
+ _("'%s' is a URL, but revision kind requires a "
+ "working copy"), target);
}
/* target is a working copy path */
@@ -907,7 +909,7 @@
else
{
return svn_error_create
- (SVN_ERR_CLIENT_BAD_REVISION, NULL, "Unknown revision kind");
+ (SVN_ERR_CLIENT_BAD_REVISION, NULL, _("Unknown revision kind"));
}
SVN_ERR (ra_lib->check_path (session, "", revnum, &kind, pool));
@@ -925,7 +927,8 @@
SVN_ERR (svn_wc_entry (&node, target, adm_access, FALSE, pool));
if (! node)
return svn_error_createf (SVN_ERR_UNVERSIONED_RESOURCE, NULL,
- "'%s' is not under version control", target);
+ _("'%s' is not under version control"),
+ target);
SVN_ERR (svn_client__get_revision_number
(&revnum, NULL, NULL, revision, target, pool));
Index: subversion/libsvn_client/ra.c
===================================================================
--- subversion/libsvn_client/ra.c (revision 9314)
+++ subversion/libsvn_client/ra.c (working copy)
@@ -30,6 +30,8 @@
#include "svn_path.h"
#include "client.h"
+#include "svn_private_config.h"
+
static svn_error_t *
open_admin_tmp_file (apr_file_t **fp,
@@ -124,7 +126,7 @@
if (! cb->commit_items)
return svn_error_createf
(SVN_ERR_UNSUPPORTED_FEATURE, NULL,
- "Attempt to set wc property '%s' on '%s' in a non-commit operation",
+ _("Attempt to set wc property '%s' on '%s' in a non-commit operation"),
name, relpath);
for (i = 0; i < cb->commit_items->nelts; i++)
@@ -308,7 +310,7 @@
if (! entry)
return svn_error_createf (SVN_ERR_ENTRY_NOT_FOUND, NULL,
- "Can't find entry for '%s'", path);
+ _("Can't find entry for '%s'"), path);
if (entry->uuid)
{
Index: subversion/libsvn_client/diff.c
===================================================================
--- subversion/libsvn_client/diff.c (revision 9314)
+++ subversion/libsvn_client/diff.c (working copy)
@@ -40,6 +40,7 @@
#include "client.h"
#include <assert.h>
+#include "svn_private_config.h"
/*
* Constant separator strings
@@ -185,26 +186,26 @@
{
return svn_error_createf
(SVN_ERR_BAD_URL, NULL,
- "URLs have no schema ('%s' and '%s')", url, ent->url);
+ _("URLs have no schema ('%s' and '%s')"), url, ent->url);
}
else if (idx1 == NULL)
{
return svn_error_createf
(SVN_ERR_BAD_URL, NULL,
- "URL has no schema: '%s'", url);
+ _("URL has no schema: '%s'"), url);
}
else if (idx2 == NULL)
{
return svn_error_createf
(SVN_ERR_BAD_URL, NULL,
- "URL has no schema: '%s'", ent->url);
+ _("URL has no schema: '%s'"), ent->url);
}
else if (((idx1 - url) != (idx2 - ent->url))
|| (strncmp (url, ent->url, idx1 - url) != 0))
{
return svn_error_createf
(SVN_ERR_UNSUPPORTED_FEATURE, NULL,
- "Access schema mixtures not yet supported ('%s' and '%s')",
+ _("Access schema mixtures not yet supported ('%s' and '%s')"),
url, ent->url);
}
@@ -266,7 +267,7 @@
label = apr_psprintf (pool, "%s\t(revision %" SVN_REVNUM_T_FMT ")",
path, revnum);
else
- label = apr_psprintf (pool, "%s\t(working copy)", path);
+ label = apr_psprintf (pool, _("%s\t(working copy)"), path);
return label;
}
@@ -455,7 +456,7 @@
continue;
else
return svn_error_createf(SVN_ERR_INVALID_DIFF_OPTION, NULL,
- "'%s' is not supported", arg);
+ _("'%s' is not supported"), arg);
}
}
@@ -1202,7 +1203,7 @@
SVN_ERR (svn_wc_adm_close (adm_access));
if (! entry)
return svn_error_createf (SVN_ERR_UNVERSIONED_RESOURCE, NULL,
- "'%s' is not under version control", path);
+ _("'%s' is not under version control"), path);
if (entry->url)
*url = apr_pstrdup (pool, entry->url);
@@ -1247,7 +1248,7 @@
{
return svn_error_create
(SVN_ERR_CLIENT_BAD_REVISION, NULL,
- "Not all required revisions specified");
+ _("Not all required revisions specified"));
}
/* Establish first RA session to URL1. */
@@ -1457,8 +1458,8 @@
unsupported_diff_error (svn_error_t *child_err)
{
return svn_error_create (SVN_ERR_INCORRECT_PARAMS, child_err,
- "Sorry, svn_client_diff was called in a way "
- "that is not yet supported");
+ _("Sorry, svn_client_diff was called in a way "
+ "that is not yet supported"));
}
@@ -1496,8 +1497,8 @@
return unsupported_diff_error
(svn_error_create
(SVN_ERR_INCORRECT_PARAMS, NULL,
- "Only diffs between a path's text-base "
- "and its working files are supported at this time"));
+ _("Only diffs between a path's text-base "
+ "and its working files are supported at this time")));
SVN_ERR (svn_wc_get_actual_target (path1, &anchor, &target, pool));
SVN_ERR (svn_io_check_path (path1, &kind, pool));
@@ -1814,7 +1815,7 @@
if ((revision1->kind == svn_opt_revision_unspecified)
|| (revision2->kind == svn_opt_revision_unspecified))
return svn_error_create (SVN_ERR_CLIENT_BAD_REVISION, NULL,
- "Not all required revisions are specified");
+ _("Not all required revisions are specified"));
/* Revisions can be said to be local or remote. BASE and WORKING,
for example, are local. */
@@ -1990,12 +1991,12 @@
SVN_ERR (svn_client_url_from_path (&URL1, source1, pool));
if (! URL1)
return svn_error_createf (SVN_ERR_ENTRY_MISSING_URL, NULL,
- "'%s' has no URL", source1);
+ _("'%s' has no URL"), source1);
SVN_ERR (svn_client_url_from_path (&URL2, source2, pool));
if (! URL2)
return svn_error_createf (SVN_ERR_ENTRY_MISSING_URL, NULL,
- "'%s' has no URL", source2);
+ _("'%s' has no URL"), source2);
if (URL1 == source1)
path1 = NULL;
@@ -2013,7 +2014,7 @@
SVN_ERR (svn_wc_entry (&entry, target_wcpath, adm_access, FALSE, pool));
if (entry == NULL)
return svn_error_createf (SVN_ERR_UNVERSIONED_RESOURCE, NULL,
- "'%s' is not under version control",
+ _("'%s' is not under version control"),
target_wcpath);
merge_cmd_baton.force = force;
Index: subversion/libsvn_client/log.c
===================================================================
--- subversion/libsvn_client/log.c (revision 9314)
+++ subversion/libsvn_client/log.c (working copy)
@@ -36,6 +36,7 @@
#include "svn_error.h"
#include "svn_path.h"
+#include "svn_private_config.h"
/*** Getting update information ***/
@@ -70,7 +71,7 @@
{
return svn_error_create
(SVN_ERR_CLIENT_BAD_REVISION, NULL,
- "Missing required revision specification");
+ _("Missing required revision specification"));
}
start_revnum = end_revnum = SVN_INVALID_REVNUM;
@@ -140,7 +141,7 @@
if (! entry->url)
return svn_error_createf
(SVN_ERR_ENTRY_MISSING_URL, NULL,
- "Entry '%s' has no URL", target);
+ _("Entry '%s' has no URL"), target);
URL = apr_pstrdup (pool, entry->url);
SVN_ERR (svn_wc_adm_close (adm_access));
(*((const char **)apr_array_push (target_urls))) = URL;
@@ -301,7 +302,8 @@
/* Log receivers are free to handle revision 0 specially... But
just in case some don't, we make up a message here. */
SVN_ERR (receiver (receiver_baton,
- NULL, 0, "", "", "No commits in repository.",
+ NULL, 0, "", "",
+ _("No commits in repository."),
pool));
}
}
Index: subversion/libsvn_client/update.c
===================================================================
--- subversion/libsvn_client/update.c (revision 9314)
+++ subversion/libsvn_client/update.c (working copy)
@@ -34,6 +34,7 @@
#include "svn_time.h"
#include "client.h"
+#include "svn_private_config.h"
/*** Code. ***/
@@ -81,10 +82,10 @@
SVN_ERR (svn_wc_entry (&entry, anchor, adm_access, FALSE, pool));
if (! entry)
return svn_error_createf (SVN_ERR_WC_OBSTRUCTED_UPDATE, NULL,
- "'%s' is not under version control", anchor);
+ _("'%s' is not under version control"), anchor);
if (! entry->url)
return svn_error_createf (SVN_ERR_ENTRY_MISSING_URL, NULL,
- "Entry '%s' has no URL", anchor);
+ _("Entry '%s' has no URL"), anchor);
URL = apr_pstrdup (pool, entry->url);
/* Get revnum set to something meaningful, so we can fetch the
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Sun Apr 11 00:38:19 2004