Translation of tree conflict messages is problematic

Hi Folks,

the current messages used to display tree conflicts are a little
problematic to translate.
They are all composed of two parts:
A: "The last xxx operation tried to yyy the zzz '%s'"
B: "%s, but it uuu locally"

Where part A gets inserted into the placeholder %s of part B.

xxx = the subversion operation
yyy = what it tried to do
zzz '%s' = the object (file/folder) and its name
uuu = the local action causing the conflict

The problem now is that file/folder are of neutral gender in English,
but have a different gender in German. No matter which gender I choose
to translate part B, I'm wrong in 50% of the cases.

First I'd like to know if it is important to distinguish between file
and folder in the conflict message or if it would be sufficient to use
'object' for file and folder?
If not, could we please switch to using 'object' instead?

If yes, I see two solutions. We could insert another placeholder into
both message parts which either contains "the file" or "the folder".
Including Article!

Example:
A: "The last xxx operation tried to yyy the %1!s! '%2!s!'"
B: "%1!s!, but %2!s! uuu locally"

in Part A: "the file|the folder" would go into %1!s!
in Part B: "the file|the folder" would go into %2!s!

Another suggestion would be to combine parts A and B into one message
and insert the actions into the xxx,yyy,zzz,uuu placeholders I have
identified above.

Example:
"The last %1!s! operation tried to %2!s! the %3!s! '%4!s!', but %3!s!
%5!s! locally."

%1!s! = update|switch|merge|...
%2!s! = add|delete|move|...
%3!s! = the file|the folder
%4!s! = the objects name
%5!s! = already exists unversioned|was already addded|was already edited|...

pleasetellmewaddyathink

Cheers
- Lübbe

--
       ___
  oo  // \\      "De Chelonian Mobile"
 (_,\/ \_/ \     TortoiseSVN
   \ \_/_\_/>    The coolest Interface to (Sub)Version Control
   /_/   \_\     http://tortoisesvn.net  PGP Key ID 0x23F511AB
------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=757&dsMessageId=2583490
To unsubscribe from this discussion, e-mail: [dev-unsubscribe_at_tortoisesvn.tigris.org].