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

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
Mobility
MO MLT LM EN CCI 1
Werner-von-Siemens-Str. 67
91052 Erlangen, Deutschland
Tel.: +49 9131 7-34264
mailto:hartmut.niemann_at_siemens.com
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>>:
Hello!

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 4.30.5.1 (Diff Viewer):

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

English, TSVN 1.9.1, chapter 4.30.5.2 (merge tool)

                %fname
                               The name of the conflicted file
                %nqfname
                               The name of the conflicted file, without quotes

German, TSVN 1.9.1, chapter 4.30.5.1. Vergleichsprogramm:
                %fname
                               Der Name der Datei. Dies ist eine leere Zeichenfolge, wenn zwei verschiedene Dateien, anstelle von zwei
                               Zuständen der selben Datei verglichen werden.
                %nqfname
                                Der Name der Datei, ohne Anführungszeichen
German, TSVN 1.9.1., chapter 4.30.5.2. Konflikteditor
                %fname
                               Der Name der Konfliktdatei in Anführungszeichen
                %nqfname
                               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
http://tortoisesvn.net/docs/release/TortoiseSVN_de/tsvn-dug-settings.html

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.

Cheers
- Lübbe

--
Please help me get more space on Dropbox :)
https://www.dropbox.com/referrals/NTIwMzcxNjI5
       ___
  oo  // \\      "De Chelonian Mobile"
 (_,\/ \_/ \     TortoiseSVN
   \ \_/_\_/>    The coolest Interface to (Sub)Version Control
   /_/   \_\     http://tortoisesvn.net<http://tortoisesvn.net/>  PGP Key ID 0x23F511AB
------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=3139137
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].