On Mon, Oct 20, 2008 at 10:22:26PM +0200, Jens Seidel wrote:
> On Mon, Oct 20, 2008 at 07:34:35PM +0100, Stefan Sperling wrote:
> > On Mon, Oct 20, 2008 at 05:22:34PM +0200, Jens Seidel wrote:
> > > msgid "No delimiter after 'node_kind' in tree conflict description"
> > >
> > > Should these error messages really get translated? Can they occur without
> > > manual editing of a repository (dump file, db, ...)?
> >
> > No, when this error occurs, either there's a bug in Subversion,
> > or the working copy has been corrupted, or both.
>
> Yep, I expected this. How often did it already happen that such a
> low-level error message was posted? It is rare, right and in bug reports
> you also prefer English strings.
>
> So let's omit marking similar messages for translation in the future?
> Would this be OK?
Sure.
> > > Please try to collect such messages into something as
> > > "No delimiter after '%s' in tree conflict description"
> > > to reduce work for translators.
> >
> > OK. Can you make a patch?
>
> I'm not sure and other people can do it probably much faster :-)
> A possible problem could be allocating memory for temporary strings.
OK. If you want to open an issue for this so it won't get lost (it's
trivial to do probably but I don't have the time right now).
>
> > > #: ../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.
> >
> > r33785.
> > "The entries file" is a general name for .svn/entries.
>
> Ah, here are other ones which I (bogusly?) translated ("Eintragsdatei") :-)
> libsvn_wc/entries.c:1382
> libsvn_wc/entries.c:1406
> libsvn_wc/entries.c:3100
>
> Stefan, if you don't like this translation feel free to use quotes as
> well. Your decision.
Yeah, if we agree that 'entries' should be in quotes, it looks like
those strings need them as well. Obvious fix?
> > > #: ../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")
> >
> > OK. Can you make a patch?
>
> Yes, I will add the quotes and directly commit it as trivial fix.
Thanks!
> > > #: ../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.
> >
> > I don't understand.
>
> Content and formatting should be separated if possible. I agree that
> combining it simplifies usually the code (e.g. here) but using some
> helper functions like indent_text(_("The update attempted..."), 2)
> it is possible to handle this.
>
> > Does this mean we have to change something in the code,
>
> Yep.
>
> Again it isn't strongly required but at least it should be considered
> (especially for more complex formatting).
>
> Think about the following:
>
> There are approximately 10 translations of Subversion available and
> at least 50 indented messages. This makes at least 500 strings in
> total. Do you really expect that all these are handled correctly?
OK, I agree that there's a problem here, but fixing just one instance
of it won't do. We should probably come up with a generic solution
and apply it all over the tree.
> > > 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)?
> >
> > Quoting libsvn_wc/tree_conflicts.h:
> >
> > * For example, a file that is deleted by an update but locally
> > * modified by the user is a victim of a tree conflict.
> >
> > Basically, the victim is in danger. What that means exactly depends
> > on the tree conflict at hand. For example, local changes made to
> > the victim may disappear if a commit was made from its tree conflicted
> > state. Or the victim may disappear from the versioned tree altogether.
> > Or the victim is not in the tree but should be, because we have a text
> > delta for it (in case of files), or file or subdirectory additions (in
> > case of directories).
> >
> > I hope this explains it. It's hard to come up with a general definition.
> >
> > Since I speak German, let me make a suggestion which does not have
> > the same negative connotations as the literal translation "Opfer":
> > "(vom Baumkonflikt) betroffenes Objekt"
> >
> > Would that do?
>
> Yes, I think so ("Opfer" would clearly be wrong). Even "Baumkonflikt"
> sounds strange but it is the direct translation and think it is OK.
>
> "konfliktverursachendes Objekt" is maybe even better (but it is more
> like "culprit" which is the opposite of "victim").
I like "betroffen" (affected) more than "verursachen" (to cause).
Stefan
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe_at_subversion.tigris.org
For additional commands, e-mail: dev-help_at_subversion.tigris.org
Received on 2008-10-20 22:50:33 CEST