Some problematic strings in Subversion

Hi,

during the German translation of Subversion I noticed a few strings I
do not properly understand or which are faulty. See also the small
attached file.

Here are my notes:

#: ../libsvn_wc/tree_conflicts.c:144
msgid "No delimiter after 'node_kind' in tree conflict description"
#: ../libsvn_wc/tree_conflicts.c:177
msgid "No delimiter after 'operation' in tree conflict description"
#: ../libsvn_wc/tree_conflicts.c:210
msgid "No delimiter after 'action' in tree conflict description"

Should these error messages really get translated? Can they occur without
manual editing of a repository (dump file, db, ...)?

Please try to collect such messages into something as
"No delimiter after '%s' in tree conflict description"
to reduce work for translators.

Similar:
#: ../svn/main.c:1642
msgid "--depth and --set-depth are mutually exclusive"
#: ../svn/main.c:1652
msgid "--with-all-revprops and --with-no-revprops are mutually exclusive"
#: ../svn/main.c:1662
msgid "--with-revprop and --with-no-revprops are mutually exclusive"

Not clear:
#: ../libsvn_wc/tree_conflicts.c:329
msgid "Invalid tree conflict data in entries file, but no idea what went wrong"

Should "entries" be translated or is it a filename (.svn/entries)? Quotes
are missing in the latter case.
Also: s/tree conflict data/tree conflict description/ for consistency?

#: ../libsvn_wc/tree_conflicts.c:383 ../svn/tree-conflicts.c:280
msgid "Bad node_kind in tree conflict description"
s/node_kind/'node_kind'/ (same for "operation", "action", "reason")

#: ../svn/tree-conflicts.c:57
#, c-format
msgid ""
" The update attempted to delete '%s'\n"
" (possibly as part of a rename operation).\n"

It's much better to avoid the indentation for translation and later
to perform s/^/ /, s/\n[^$]/\n /. So it is easiely possible to
change the indentaion later.

#: ../svn/tree-conflicts.c:109
#, c-format
msgid ""
"Either you have added '%s' locally, or it has been added in the\n"
"history of the branch you are merging into.\n"

s/into/from/? If the addition happend in the past of the current branch
Subversion would know about it, right?

A few times there occurs "victim" and I have trouble translating it. A victim
is the item which caused a tree conflict, right? So a translation similar to
"reason" would make sense? Do you have a small example (add it as translator
comment in the source)?

#: ../libsvn_wc/tree_conflicts.c:357
msgid "Empty victim path in tree conflict description"
#: ../svn/tree-conflicts.c:242
#, c-format
msgid "Invalid tree conflict data for victim %s"

PS: The German translation in trunk is now up-to-date (except two
strings). Will merge it into 1.5.x soon ...

Jens

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe_at_subversion.tigris.org
For additional commands, e-mail: dev-help_at_subversion.tigris.org