Re: Languages files for the gui

[Catalin Codreanu]

2013/6/26 Jordi Gutiérrez Hermoso <address@hidden>

On 26 June 2013 17:01, David Bateman <address@hidden> wrote:
> On 06/25/2013 08:50 PM, Catalin Codreanu wrote:
>> Hello,
>>
>> Here is the french translation file and patch. Can someone please post
>> the patch to the tracker, I seemed to have blocked my account.
>>
>> I've looked over all the phrases but a couple more eyes won't hurt.
>> I've based largely on eclipse for the technical terms.
>> One thing I'll need to keep check tomorrow is the accelerator keys.
>> I'm not quite sure they all make sense nor that they do not overlap
>> but I need to see that in context.
>>
>> Cheers,
>> Cat
>>
> Catalin,
>
> As your changeset didn't apply cleanly I had to apply manually some of
> your proposed changes and reconstruct a changeset against the tip.

The idea of using hg csets is that their metadata is supposed to help
you apply the patch exactly at the location in which it was created.
You can do this with

    hg import --exact patchname

Once that's there, you can use hg tools to rebase the patch or
whatever, using a merge tool of your choice.

Well, at least I find merge tools easier to use than manually applying
hunks and fixing .rejs.

However, in this case, Catalin based the translation patch on a commit
that doesn't exist in Savannah. Catalin, what does "hg rev -r
9968803399fa0" say?

- Jordi G. H.

It doesn't say much :

address@hidden octave$ hg rev -r 9968803399fa0
abandon : no files or directories specified
(use --all to revert all files)

My hg log is as follows :

address@hidden octave$ hg log -l 5
changeset:   16849:9968803399fa
tag:         tip
user:        Catalin Codreanu <address@hidden>
date:        Tue Jun 25 20:23:03 2013 +0200
summary:     Updated french translation

changeset:   16848:77c8aae15908
user:        Juan Pablo Carbajal <address@hidden>
date:        Tue Jun 25 11:48:41 2013 -0400
summary:     accept remove option for autoload

changeset:   16847:474e6d189de1
user:        John W. Eaton <address@hidden>
date:        Tue Jun 25 11:10:26 2013 -0400
summary:     use SED in scripts/mk-pkg-add script, use set -e consistently

changeset:   16846:e6401864d791
user:        Carnë Draug <address@hidden>
date:        Tue Jun 25 15:39:47 2013 +0200
summary:     doc: fix documentation about packages.

changeset:   16845:9d1d8bdd71de
user:        Rik <address@hidden>
date:        Mon Jun 24 20:47:34 2013 -0700
summary:     NEWS: Add new functions to list for 3.8 release.

Thanks for looking into this Jordi.

Cheers,
Cat