Re: svn commit: r10686 - branches/1.1.x/subversion/po

["Øyvind A. Holm" <su...@sunbase.org>]

On 2004-08-19 07:44:23 Lübbe Onken <lu...@tigris.org> wrote:
> Author: luebbe
> Date: Thu Aug 19 07:44:20 2004
> New Revision: 10686
>
> Modified:
>    branches/1.1.x/subversion/po/de.po
> Log:
> update german translation on the 1.1.x branch

Is this a Good Thing, i.e. editing directly on the branch? They say 
everything that's going to the 1.1.x branch should be merged from trunk, 
but as I previously mentioned on this list (thread located at 
<http://subversion.tigris.org/servlets/BrowseList?list=dev&by=thread&from=221029>), 
trunk and the 1.1.x branch seems to get more and more out of sync, and 
merging .po updates to the branch from trunk will result in a incomplete 
translation. As long as the changes is made carefully to the file and 
msgfmt -c is used to check that the .po file is correct, I believe it 
should be OK to edit the .po files directly on the branch. An 
alternative could be to create an additional branch where editing can 
take place. This edit branch is always synced against the 1.1.x branch 
which, when it's time to merge in changes to 1.1.x have its .po changes 
fetched from this instead of trunk. This last method sounds a bit like 
overkill and pretty cumbersome, but it could work.

Just to have mentioned a third alternative, a method which I think 
smells rather badly, is to create two commits in trunk — one with the 
1.1.x updates, and the following is the trunk version. This method has 
the disadvantage that it creates two commits, but also makes users 
updating between these two commits to get stuck with the 1.1.x version 
which would be even more out of sync than the trunk version on the 1.1.x 
branch would be. So I don't think this is a plausible alternative, just 
wanted to mention it before someone else does.

> +"Last-Translator: Lübbe Onken <l....@rac.de>\n"

This breaks with the policy in HACKING:

   *  We have a tradition of not marking files with the names of 
      individual authors (i.e., we don't put lines like "Author: foo" or 
      "@author foo" in a special position at the top of a source file).  
      This is to discourage territoriality -- even when a file has only 
      one author, we want to make sure others feel free to make changes.  
      People might be unnecessarily hesitant if someone appears to have 
      staked ownership on the file.

The TRANSLATION file suggests a way to do it:

  The first translation block in the .po file contains two lines like 
  these:
    "Last-Translator: FULL NAME <EM...@ADDRESS>\n"
    "Language-Team: LANGUAGE <LL...@li.org>\n"

  Please replace those with these two lines:
    "Last-Translator: Subversion Developers <de...@subversion.tigris.org>\n"
    "Language-Team: YOUR LANGUAGE <de...@subversion.tigris.org>\n"

Regards,
Øyvind A. Holm
--------------------------------------------------------------
Say NO to software patents in Europe! <http://swpat.ffii.org/>

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org