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

AW: Documentation errors in the german and english nightly doc regarding %fname?

From: Niemann, Hartmut <hartmut.niemann_at_siemens.com>
Date: Wed, 23 Sep 2015 08:58:04 +0000

Hallo Lübbe!

%fname is documented as „conflicted file“ in the chapter „diff viewer“, and as
“...if two different files are diffed ... “ in the chapter “merge tool”.

There is no “conflicted file” in the diff viewer context,
and there is no “diffed file” in the merge context.
That doesn’t make sense to me, the texts should be swapped between chapters.

Mit freundlichen Grüßen
Dr. Hartmut Niemann

Siemens AG
Werner-von-Siemens-Str. 67
91052 Erlangen, Deutschland
Tel.: +49 9131 7-34264
Von: Lübbe Onken [mailto:luebbe.tortoisesvn_at_gmail.com]
Gesendet: Mittwoch, 23. September 2015 10:46
An: users_at_tortoisesvn.tigris.org
Betreff: Re: Documentation errors in the german and english nightly doc regarding %fname?

Hi Hartmut,

2015-09-22 12:50 GMT+02:00 Niemann, Hartmut <hartmut.niemann_at_siemens.com<mailto:hartmut.niemann_at_siemens.com>>:

In the 1.9.1 documentation the %fname/%nqfname description is still switched between the diff viewer and the merge chapter.

IMHO it should be
English, TSVN 1.9.1, chapter (Diff Viewer):

                               The name of the file. This is an empty string if two different files are diffed instead of two states of the same file.
                               The name of the file, without quotes

English, TSVN 1.9.1, chapter (merge tool)

                               The name of the conflicted file
                               The name of the conflicted file, without quotes

German, TSVN 1.9.1, chapter Vergleichsprogramm:
                               Der Name der Datei. Dies ist eine leere Zeichenfolge, wenn zwei verschiedene Dateien, anstelle von zwei
                               Zuständen der selben Datei verglichen werden.
                                Der Name der Datei, ohne Anführungszeichen
German, TSVN 1.9.1., chapter Konflikteditor
                               Der Name der Konfliktdatei in Anführungszeichen
                               Der Name der Konflikdatei ohne Anführungszeichen
Please correct this.

Where do you see a problem? When I open:
http://tortoisesvn.net/docs/release/TortoiseSVN_en/tsvn-dug-settings.html and

side by side and search for fname, both entries look correct to me. The same goes for the F1 help. I don't see what's wrong. Please enlighten me.

There's only a small typo "Konflikdatei" in the German translation, which I have fixed.

- Lübbe

Please help me get more space on Dropbox :)
  oo  // \\      "De Chelonian Mobile"
 (_,\/ \_/ \     TortoiseSVN
   \ \_/_\_/>    The coolest Interface to (Sub)Version Control
   /_/   \_\     http://tortoisesvn.net<http://tortoisesvn.net/>  PGP Key ID 0x23F511AB
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2015-09-23 10:58:23 CEST

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

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