Re: Translation of tree conflict messages is problematic

Am 16.04.2010 13:14, schrieb Stefan Küng:
> On 15.04.2010 10:19, Lübbe Onken wrote:
>> 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.
>
> But that's only on the 1.6.x branch. On trunk, there's no placeholder
> for the object (file/folder) anymore.

I'm running a nightly, so I guess they're still there on trunk :)
I'm talking about the following stringtables in TortoiseProcEng.rc:

---SNIP---
STRINGTABLE
BEGIN
    IDS_TREECONFLICT_REASON_EDITED "%s, but it was already edited."
    IDS_TREECONFLICT_REASON_OBSTRUCTED
                            "%s, but it was obstructed in the working copy."
    IDS_TREECONFLICT_REASON_DELETED
                            "%s, but it was deleted, moved or renamed
locally."
    IDS_TREECONFLICT_REASON_ADDED "%s, but it was already added locally."
    IDS_TREECONFLICT_REASON_MISSING "%s, but it is missing locally."
    IDS_TREECONFLICT_REASON_UNVERSIONED
                            "%s, but it already exists unversioned locally."
END

STRINGTABLE
BEGIN
    IDS_TREECONFLICT_FILEUPDATEEDIT
                            "The last update operation tried to modify
the file '%s'"
    IDS_TREECONFLICT_FILEUPDATEADD
                            "The last update operation tried to add the
file '%s'"
    IDS_TREECONFLICT_FILEUPDATEDELETE
                            "The last update operation tried to
delete/move/rename the file '%s'"

[...]
---SNIP---

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=2585084
To unsubscribe from this discussion, e-mail: [dev-unsubscribe_at_tortoisesvn.tigris.org].