openerp-doc team mailing list archive

[John Bradshaw <john@xxxxxxxxxxxxxxxx>]

Sergei,

When you do the conflict check can you send me the report privately? I'm
happy to work with you on any fixes to the English text. Thanks.

Regards,
John.



On Thu, 2011-08-25 at 15:16 +0400, Sergei Kostigoff (personal) wrote:
> Don,
> 
> Thank you for your help. It will take some while however. At present I 
> am reading guides.)
> 
> Will proceed as per your advice, and then let you know results | 
> problems is any.
> 
> Regards
> Sergei
> 
> On 08/24/2011 11:37 PM, Don Kirkby wrote:
> > Thanks very much, Sergei. Here are some links to the related documentation.
> >
> > http://doc.bazaar.canonical.com/latest/en/user-guide/merging_changes.html
> > This covers the basics of merging. For you, the easiest thing to do is
> > to check out both the 5.0 and 6.0 branches to your computer. If you
> > use a shared repository, that will save a bunch of disk space, but
> > it's not necessary. Once you've got the two branches in directories
> > named 5.0 and 6.0, change to the 6.0 directory and execute this
> > command:
> >
> > bzr merge ../5.0
> >
> > That will attempt the merge and report all the conflicts. Then read
> > this documentation on resolving conflicts:
> > http://doc.bazaar.canonical.com/latest/en/user-guide/resolving_conflicts.html
> >
> > This might also be helpful:
> > http://doc.bazaar.canonical.com/bzr.0.91/en/user-guide/conflicts.html
> >
> > Finally, run the build of the 6.0 branch to make sure it works. Be
> > sure to build the Russian documentation as well, since that's where
> > all the conflicts are. Commit the 6.0 branch when it all builds
> > properly.
> >
> > Thanks again for helping out.
> >
> > yours,
> > Don Kirkby
> >
> > On 24 August 2011 12:03, Sergei Kostigoff (personal)
> > <sergei.kostigoff@xxxxxxxxx>  wrote:
> >> -----BEGIN PGP SIGNED MESSAGE-----
> >> Hash: SHA1
> >>
> >> Don,
> >>
> >> I would be happy to do merge.
> >>
> >> Please point to instruction on how to do this.
> >>
> >> Regards
> >> Sergei
> >>
> >> On 08/24/2011 10:44 PM, Don Kirkby wrote:
> >>> Greetings, doc team,
> >>> It looks like Sergei did a bunch of translation in the 5.0 branch in
> >>> May, but didn't merge it into the 6.0 branch. Then John fixed a bunch
> >>> of spelling mistakes in the 6.0 branch in July.
> >>>
> >>> Both changes are appreciated, but now the two changes have over 100
> >>> conflicts with each other. Would either of you like to do the cleanup?
> >>> Any other volunteers?
> >>>
> >>> thanks,
> >>> Don Kirkby
> >> -----BEGIN PGP SIGNATURE-----
> >> Version: GnuPG v1.4.10 (GNU/Linux)
> >> Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/
> >>
> >> iQEcBAEBAgAGBQJOVUseAAoJEBGxzqLK4PzHzgYIAM1gsPoSqhikQehW5jnVb0Or
> >> u4lmyOQM18jB1L+dw76z4k0WUpvQaXK/RSMzDgtcuYfoxfTYDOLdO/UmVJApj1Db
> >> sH+4Lz2JbclOpJvhDKXmcnUvyGTVpYruzLOpEDilUw7K83PO4ABUmgQkYF6Y9EgD
> >> QEmeI0KLF2qBBOCkIYGREOYwSE+4qY9MEnO8dPZhm4M71gowzJZcVnTg00Tx6KTl
> >> /XCmoLAT9eNjKEpqcWFD3OO2PhalhRy05hZZucqBblTzf1/Uf57CF8lIfLwBbPXz
> >> b98fhZff/TQNZKV5G+qytJfauu7L3cs16pKPs0e8HJ1ViolLkPYgDJAykFSRamc=
> >> =Q311
> >> -----END PGP SIGNATURE-----
> >>
>