Mark strings containing %ld (revision number) for translation all over. Also remove single quotes around revision numbers in some of the strings. Add #include "svn_private_config.h" where needed. Index: subversion/libsvn_fs_base/tree.c =================================================================== --- subversion/libsvn_fs_base/tree.c (revision 9704) +++ subversion/libsvn_fs_base/tree.c (arbetskopia) @@ -33,6 +33,7 @@ #include #include #include +#include "svn_private_config.h" #include "svn_pools.h" #include "svn_error.h" #include "svn_path.h" @@ -377,7 +378,7 @@ return svn_error_createf (SVN_ERR_FS_NOT_FOUND, 0, - "File not found: revision '%ld', path '%s'", + _("File not found: revision %ld, path '%s'"), root->rev, path); } @@ -398,7 +399,7 @@ return svn_error_createf (SVN_ERR_FS_ALREADY_EXISTS, 0, - "File already exists: filesystem '%s', revision '%ld', path '%s'", + _("File already exists: filesystem '%s', revision %ld, path '%s'"), fs->path, root->rev, path); } Index: subversion/libsvn_fs_base/err.c =================================================================== --- subversion/libsvn_fs_base/err.c (revision 9704) +++ subversion/libsvn_fs_base/err.c (arbetskopia) @@ -22,6 +22,7 @@ #include #include +#include "svn_private_config.h" #include "svn_fs.h" #include "err.h" #include "id.h" @@ -65,7 +66,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); } @@ -108,7 +109,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); } @@ -163,7 +164,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); } Index: subversion/svnadmin/main.c =================================================================== --- subversion/svnadmin/main.c (revision 9704) +++ subversion/svnadmin/main.c (arbetskopia) @@ -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/svnlook/main.c =================================================================== --- subversion/svnlook/main.c (revision 9704) +++ subversion/svnlook/main.c (arbetskopia) @@ -807,7 +807,7 @@ SVN_ERR (svn_utf_cstring_from_utf8 (&base_path_native, base_path, pool)); - printf ("Copied: %s (from rev %ld, %s)\n", + printf (_("Copied: %s (from rev %ld, %s)\n"), path_native, node->copyfrom_rev, base_path_native); SVN_ERR (svn_fs_revision_root (&base_root, Index: subversion/libsvn_client/ra.c =================================================================== --- subversion/libsvn_client/ra.c (revision 9704) +++ subversion/libsvn_client/ra.c (arbetskopia) @@ -433,8 +433,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); } @@ -569,7 +569,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. */ @@ -629,17 +629,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 @@ -659,7 +659,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 9704) +++ subversion/libsvn_client/diff.c (arbetskopia) @@ -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); @@ -1613,12 +1613,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 9704) +++ subversion/libsvn_client/copy.c (arbetskopia) @@ -24,6 +24,7 @@ #include #include +#include "svn_private_config.h" #include "svn_wc.h" #include "svn_client.h" #include "svn_string.h" @@ -378,7 +379,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. */ @@ -786,7 +787,7 @@ 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 Index: subversion/libsvn_client/blame.c =================================================================== --- subversion/libsvn_client/blame.c (revision 9704) +++ subversion/libsvn_client/blame.c (arbetskopia) @@ -20,6 +20,7 @@ #include "client.h" +#include "svn_private_config.h" #include "svn_client.h" #include "svn_string.h" #include "svn_error.h" @@ -399,9 +400,9 @@ } else return svn_error_createf (APR_EGENERAL, NULL, - "Revision action '%c' for " - "revision %ld of '%s'" - "lacks a prior revision", + _("Revision action '%c' for " + "revision %ld of '%s'" + "lacks a prior revision"), lmb.action, lmb.eldest->revision, lmb.eldest->path); Index: subversion/clients/cmdline/propdel-cmd.c =================================================================== --- subversion/clients/cmdline/propdel-cmd.c (revision 9704) +++ subversion/clients/cmdline/propdel-cmd.c (arbetskopia) @@ -22,6 +22,7 @@ /*** Includes. ***/ +#include "svn_private_config.h" #include "svn_cmdline.h" #include "svn_wc.h" #include "svn_pools.h" @@ -94,7 +95,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); } } Index: subversion/clients/cmdline/util.c =================================================================== --- subversion/clients/cmdline/util.c (revision 9704) +++ subversion/clients/cmdline/util.c (arbetskopia) @@ -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/propset-cmd.c =================================================================== --- subversion/clients/cmdline/propset-cmd.c (revision 9704) +++ subversion/clients/cmdline/propset-cmd.c (arbetskopia) @@ -22,6 +22,7 @@ /*** Includes. ***/ +#include "svn_private_config.h" #include "svn_cmdline.h" #include "svn_wc.h" #include "svn_pools.h" @@ -122,7 +123,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); } } Index: subversion/clients/cmdline/notify.c =================================================================== --- subversion/clients/cmdline/notify.c (revision 9704) +++ subversion/clients/cmdline/notify.c (arbetskopia) @@ -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); } } Index: subversion/clients/cmdline/proplist-cmd.c =================================================================== --- subversion/clients/cmdline/proplist-cmd.c (revision 9704) +++ subversion/clients/cmdline/proplist-cmd.c (arbetskopia) @@ -22,6 +22,7 @@ /*** Includes. ***/ +#include "svn_private_config.h" #include "svn_cmdline.h" #include "svn_wc.h" #include "svn_pools.h" @@ -85,7 +86,7 @@ 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 Index: subversion/clients/cmdline/propedit-cmd.c =================================================================== --- subversion/clients/cmdline/propedit-cmd.c (revision 9704) +++ subversion/clients/cmdline/propedit-cmd.c (arbetskopia) @@ -22,6 +22,7 @@ /*** Includes. ***/ +#include "svn_private_config.h" #include "svn_cmdline.h" #include "svn_wc.h" #include "svn_pools.h" @@ -128,12 +129,12 @@ 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) Index: subversion/clients/cmdline/info-cmd.c =================================================================== --- subversion/clients/cmdline/info-cmd.c (revision 9704) +++ subversion/clients/cmdline/info-cmd.c (arbetskopia) @@ -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) { @@ -156,7 +156,7 @@ } if (SVN_IS_VALID_REVNUM (entry->copyfrom_rev)) - printf ("Copied From Rev: %ld\n", + printf (_("Copied From Rev: %ld\n"), entry->copyfrom_rev); } @@ -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 9704) +++ subversion/svndumpfilter/main.c (arbetskopia) @@ -21,6 +21,7 @@ #include +#include "svn_private_config.h" #include "svn_cmdline.h" #include "svn_error.h" #include "svn_opt.h" @@ -635,14 +636,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 +886,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_repos/load.c =================================================================== --- subversion/libsvn_repos/load.c (revision 9704) +++ subversion/libsvn_repos/load.c (arbetskopia) @@ -16,6 +16,7 @@ */ +#include "svn_private_config.h" #include "svn_pools.h" #include "svn_error.h" #include "svn_fs.h" @@ -787,8 +788,8 @@ if (pb->outstream) SVN_ERR (svn_stream_printf (pb->outstream, pool, - "<<< Started new transaction, based on " - "original revision %ld\n", rb->rev)); + _("<<< Started new transaction, based on " + "original revision %ld\n"), rb->rev)); } /* If we're parsing revision 0, only the revision are (possibly) @@ -827,8 +828,8 @@ if (! SVN_IS_VALID_REVNUM(src_rev)) return svn_error_createf (SVN_ERR_FS_NO_SUCH_REVISION, NULL, - "Relative source revision %ld is not" - " available in current repository", + _("Relative source revision %ld is not" + " available in current repository"), src_rev); SVN_ERR (svn_fs_revision_root (©_root, pb->fs, src_rev, pool)); @@ -1104,15 +1105,15 @@ if (new_rev == rb->rev) { SVN_ERR (svn_stream_printf (pb->outstream, rb->pool, - "\n------- Committed revision %ld" - " >>>\n\n", new_rev)); + _("\n------- Committed revision %ld" + " >>>\n\n"), new_rev)); } else { SVN_ERR (svn_stream_printf (pb->outstream, rb->pool, - "\n------- Committed new rev %ld" - " (loaded from original rev %ld" - ") >>>\n\n", new_rev, rb->rev)); + _("\n------- Committed new rev %ld" + " (loaded from original rev %ld" + ") >>>\n\n"), new_rev, rb->rev)); } } Index: subversion/libsvn_repos/log.c =================================================================== --- subversion/libsvn_repos/log.c (revision 9704) +++ subversion/libsvn_repos/log.c (arbetskopia) @@ -19,6 +19,7 @@ #define APR_WANT_STRFUNC #include +#include "svn_private_config.h" #include "svn_pools.h" #include "svn_error.h" #include "svn_path.h" @@ -159,11 +160,11 @@ if (start > head) return svn_error_createf (SVN_ERR_FS_NO_SUCH_REVISION, 0, - "No such revision '%ld'", start); + _("No such revision %ld"), start); if (end > head) return svn_error_createf (SVN_ERR_FS_NO_SUCH_REVISION, 0, - "No such revision '%ld'", end); + _("No such revision %ld"), end); /* If paths were specified, then we only really care about revisions in which those paths were changed. So we ask the filesystem for Index: subversion/libsvn_repos/dump.c =================================================================== --- subversion/libsvn_repos/dump.c (revision 9704) +++ subversion/libsvn_repos/dump.c (arbetskopia) @@ -16,6 +16,7 @@ */ +#include "svn_private_config.h" #include "svn_pools.h" #include "svn_error.h" #include "svn_fs.h" @@ -421,10 +422,10 @@ && eb->feedback_stream) svn_stream_printf (eb->feedback_stream, pool, - "WARNING: Referencing data in revision %ld" - ", which is older than the oldest\nWARNING: dumped revision " - "(%ld). Loading this dump into an empty " - "repository\nWARNING: will fail.\n", + _("WARNING: Referencing data in revision %ld" + ", which is older than the oldest\nWARNING: dumped revision " + "(%ld). Loading this dump into an empty " + "repository\nWARNING: will fail.\n"), cmp_rev, eb->oldest_dumped_rev); if (eb->stream) @@ -951,13 +952,13 @@ /* Validate the revisions. */ if (start_rev > end_rev) return svn_error_createf (SVN_ERR_REPOS_BAD_ARGS, NULL, - "Start revision %ld" - " is greater than end revision %ld", + _("Start revision %ld" + " is greater than end revision %ld"), start_rev, end_rev); if (end_rev > youngest) return svn_error_createf (SVN_ERR_REPOS_BAD_ARGS, NULL, - "End revision %ld is invalid " - "(youngest revision is %ld)", + _("End revision %ld is invalid " + "(youngest revision is %ld)"), end_rev, youngest); if ((start_rev == 0) && incremental) incremental = FALSE; /* revision 0 looks the same regardless of @@ -1065,7 +1066,7 @@ svn_pool_clear (subpool); if (feedback_stream) SVN_ERR (svn_stream_printf (feedback_stream, pool, - "* %s revision %ld.\n", + _("* %s revision %ld.\n"), stream ? "Dumped" : "Verified", to_rev)); } Index: subversion/libsvn_repos/rev_hunt.c =================================================================== --- subversion/libsvn_repos/rev_hunt.c (revision 9704) +++ subversion/libsvn_repos/rev_hunt.c (arbetskopia) @@ -18,6 +18,7 @@ #include +#include "svn_private_config.h" #include "svn_pools.h" #include "svn_error.h" #include "svn_fs.h" @@ -56,7 +57,7 @@ if (! date_str) return svn_error_createf (SVN_ERR_FS_GENERAL, NULL, - "Failed to find time on revision %ld", rev); + _("Failed to find time on revision %ld"), rev); SVN_ERR (svn_time_from_cstring (tm, date_str->data, pool)); @@ -191,11 +192,11 @@ if (! SVN_IS_VALID_REVNUM (start)) return svn_error_createf (SVN_ERR_FS_NO_SUCH_REVISION, 0, - "Invalid start revision %ld", start); + _("Invalid start revision %ld"), start); if (! SVN_IS_VALID_REVNUM (end)) return svn_error_createf (SVN_ERR_FS_NO_SUCH_REVISION, 0, - "Invalid end revision %ld", end); + _("Invalid end revision %ld"), end); /* Ensure that the input is ordered. */ if (start > end) Index: subversion/libsvn_fs_fs/tree.c =================================================================== --- subversion/libsvn_fs_fs/tree.c (revision 9704) +++ subversion/libsvn_fs_fs/tree.c (arbetskopia) @@ -33,6 +33,7 @@ #include #include #include +#include "svn_private_config.h" #include "svn_pools.h" #include "svn_error.h" #include "svn_path.h" @@ -330,7 +331,7 @@ return svn_error_createf (SVN_ERR_FS_NOT_FOUND, 0, - "File not found: revision '%ld', path '%s'", + _("File not found: revision %ld, path '%s'"), root->rev, path); } @@ -351,7 +352,7 @@ return svn_error_createf (SVN_ERR_FS_ALREADY_EXISTS, 0, - "File already exists: filesystem '%s', revision '%ld', path '%s'", + _("File already exists: filesystem '%s', revision %ld, path '%s'"), fs->path, root->rev, path); } Index: subversion/libsvn_fs_fs/err.c =================================================================== --- subversion/libsvn_fs_fs/err.c (revision 9704) +++ subversion/libsvn_fs_fs/err.c (arbetskopia) @@ -22,6 +22,7 @@ #include #include +#include "svn_private_config.h" #include "svn_fs.h" #include "fs.h" #include "err.h" @@ -67,7 +68,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); } @@ -110,7 +111,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); } @@ -165,7 +166,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); }