Conflicting changes in Russian translation

[Martin Geisler]

Andrei Polushin <polushin at gmail.com> writes:

Hi Andrei,

> Martin, I propose to strip these revisions from hg-i18n. See details below.

We don't strip changes from public repositories -- it's naughty if
someone has already pulled them.

The translation can be reverted instead:

  $ hg revert -r d8238600265d i18n/ru.po
  $ hg commit -m "i18n-ru: reverted to d8238600265d

  Because... please add an explanation in the long commit message."

>> http://bitbucket.org/mg/hg-i18n/changeset/912525f7b8e2
>> changeset:   15606:912525f7b8e2
>> tag:         tip
>> user:        Alexander Sauta <demosito at gmail.com>
>> date:        Thu Dec 08 00:05:24 2011 +0300
>> summary:     i18n-ru: eol, fetch, color, LargeFiles, gpg, keywords translated
>
> This one is a real translation, but it uses a non-discussed
> vocabulary, thus it looks like an attempt to interfere with my current
> efforts on editing the translation using our new vocabulary.
>
> That's why I propose to strip these revisions completely and put
> Russian translation on hold, until we'll be able to coordinate.

The only (strict) way we have to put things on hold is to remove the
push access to hg-i18n. I would prefer to avoid this and let you discuss
this among yourselves instead.

Andrei, I've given you push access to hg-i18n too so that you can help
cleanup/improve the translation. The new changestes are on the default
branch, so they wont affect "normal" users until Mercurial 2.1 is
released in some months -- I think you have time to discuss the issues
and figure out a good solution before then. Please don't rush and make
edit wars in the repository...

Let me just add that it's great to see so many people wanting to improve
the translation!

-- 
Martin Geisler

Mercurial links: http://mercurial.ch/
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 197 bytes
Desc: not available
URL: <http://selenic.com/pipermail/mercurial-devel/attachments/20111208/aec60429/attachment.pgp>