Re: [PATCH] Message tweaks

Hi Peter,

Thanks for the contribution. When I tried applying the patch, I had
conflicts though. Which is strange since your patch is generated against the
same revision I was applying against. Any idea why they occur?

(still reading the rest of the patch)

bye,

Erik.

These are the rej files (sorry for the wrapping):

subversion/libsvn_wc/adm_ops.c.rej
***************
*** 1228,1234 ****
        if (kind == svn_node_file)
          {
            if ((err = svn_io_copy_file (base_thing, thing, FALSE, pool)))
- return revert_error (err, fullpath, "restoring props", pool);
   
            SVN_ERR (svn_io_file_affected_time (&tstamp, thing, pool));
            entry->prop_time = tstamp;
--- 1228,1234 ----
        if (kind == svn_node_file)
          {
            if ((err = svn_io_copy_file (base_thing, thing, FALSE, pool)))
+ return revert_error (err, fullpath, _("restoring props"),
pool);
   
            SVN_ERR (svn_io_file_affected_time (&tstamp, thing, pool));
            entry->prop_time = tstamp;

subversion/libsvn_client/diff.c.rej:
***************
*** 1247,1253 ****
      {
        return svn_error_create
          (SVN_ERR_CLIENT_BAD_REVISION, NULL,
- "Not all required revisions specified");
      }
   
    /* Establish first RA session to URL1. */
--- 1247,1253 ----
      {
        return svn_error_create
          (SVN_ERR_CLIENT_BAD_REVISION, NULL,
+ "Not all required revisions are specified");
      }
   
    /* Establish first RA session to URL1. */

subversion/svnversion/main.c.rej
***************
*** 122,128 ****
  {
    fprintf
      (stderr,
- _("usage: svnversion [options] wc_path [trail_url]\n\n"
         " Produce a compact \"version number\" for the working copy
path\n"
         " WC_PATH. TRAIL_URL is the trailing portion of the URL used
to\n"
         " determine if WC_PATH itself is switched (detection of
switches\n"
--- 122,128 ----
  {
    fprintf
      (stderr,
+ _("usage: svnversion [OPTIONS] WC_PATH [TRAIL_URL]\n\n"
         " Produce a compact \"version number\" for the working copy
path\n"
         " WC_PATH. TRAIL_URL is the trailing portion of the URL used
to\n"
         " determine if WC_PATH itself is switched (detection of
switches\n"

> Hi,
>
> I found some inconsistencies and errors in messages while working on the
> Swedish translation. Here's a patch. It also adds _() around a few small
> strings.
>
> Enjoy!
> //Peter
>
> * subversion/clients/cmdline/main.c
> * subversion/libsvn_client/diff.c
> * subversion/libsvn_client/log.c
> * subversion/libsvn_ra_dav/session.c
> * subversion/libsvn_ra_dav/fetch.c
> * subversion/libsvn_ra_dav/util.c
> * subversion/libsvn_wc/props.c
> * subversion/libsvn_wc/entries.c
> * subversion/libsvn_wc/copy.c
> * subversion/libsvn_wc/adm_crawler.c
> * subversion/libsvn_wc/adm_ops.c
> * subversion/libsvn_wc/update_editor.c
> * subversion/svnadmin/main.c
> * subversion/svnversion/main.c
> Tweak messages for consistency. Some small corrections and additions of
> _() around a few more ones.

-- 
NEU : GMX Internet.FreeDSL
Ab sofort DSL-Tarif ohne Grundgebühr: http://www.gmx.net/dsl
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org