[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: Oto BREZINA <brezina_at_printflow.sk>
Date: 2006-09-25 22:13:55 CEST
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?
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 ?

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 ?

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.

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

Stefan Küng wrote:
Oto BREZINA wrote:
In TortoiseMerge is text:
<guibutton>Save</guibutton> saves any changes you have made. If you have selected <guilabel>Resolve conflicted Subversion status on save</guilabel> in the settings dialog, then Subversion's conflict working files will be deleted automatically if all conflicts were resolved.

Is this option "Resolve conflicted Subversion status on save" available ? I don't found it in GUI nor TortoiseMerge menu. Should I remove it from traslation I'm working on?

Jikes! That option was removed in revision 2671 (feb 16, 2005)!
I think we have to update our docs :)

Is support for plural forms? Sometimes it is hard to translate without it.

What do you mean exactly?


--------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscribe@tortoisesvn.tigris.org For additional commands, e-mail: dev-help@tortoisesvn.tigris.org Received on Mon Sep 25 22:17:54 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.