[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Re: TortoiseMerge Help

From: Stefan Küng <tortoisesvn_at_gmail.com>
Date: 2006-09-26 19:32:41 CEST

Oto BREZINA wrote:
> 0. Thanks for many support
> 1. I'm not happy that there is no support for plural, but it is not
> necessary.
> 2. I done some translation of TortoiseMerge doc, I upload it, but it is
> not includes in nightly builds. What should I do?

The documentation is not uploaded nightly but only on sundays (once a
week). That's because the whole docs with all the translations is over
60MB in size, and I have to save a little bit of bandwidth :)

> 3. I think there some suggestion/question. Maybe I'm wrong in it so
> think carefully - and don't accept wrong one. :)
> in TortoiseMerge is: /<guibutton>Show Spaces</guibutton> toggles the
> option to display space and tab characters as symbols so you can
> distinguish white space changes./
> but, in Tortoise.pot I found only: /Show Whitespaces/
> it is same ?

Yes, that's the same. I think the docs are wrong here.
Fixed the docs in revision 7628.

> in TortoiseMerge: /This command produces a copy of a versioned *folder*,
> just like a working copy, but without the local <literal>.svn</literal>
> *folders*./
> is plural right here ?

I think we could use 'folder' for both. But 'folders' is also ok - but
I'm not a native English speaker, so...

> in TortoiseMerge: /<guibutton>Reload</guibutton> discards any changes
> you have made and reloads the *original* files./
> Why original, they may be changed in mean time. I sometime use this.

Well, 'original' in this case means the same files as you loaded before.
If they've changed in the mean time, that's outside of our control.
And we don't want to nitpick here :)

> in TortoiseMerge: /<guilabel>Ignore Leading Whitespaces</guilabel> hides
> changes which are due solely to leading whitespace (indentation). Other
> whitespace changes within a line are shown <quote>inline</quote> rather
> than as added/removed lines./
> I don't found/identify corensponding in Tortoise. Instead I found this.
> I'm not sure about meaning (differences) of 2 and 3
> * &Compare whitespaces
> * &Ignore whitespace changes
> * Ignore &all whitespaces

Yes, the docs need to be adjusted here.


   oo  // \\      "De Chelonian Mobile"
  (_,\/ \_/ \     TortoiseSVN
    \ \_/_\_/>    The coolest Interface to (Sub)Version Control
    /_/   \_\     http://tortoisesvn.net
To unsubscribe, e-mail: dev-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: dev-help@tortoisesvn.tigris.org
Received on Tue Sep 26 19:32:51 2006

This is an archived mail posted to the TortoiseSVN Dev mailing list.

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.