| Re: [translations] New set of Catalan translations |
[ Thread Index |
Date Index
| More lilynet.net/translations Archives
]
- To: Translations Lilypond <translations@xxxxxxxxxxx>
- Subject: Re: [translations] New set of Catalan translations
- From: Walter Garcia-Fontes <walter.garcia@xxxxxxx>
- Date: Sun, 14 May 2017 20:03:12 +0200
- Dkim-signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=upf.edu; s=google; h=date:from:to:subject:message-id:reply-to:references:mime-version :content-disposition:in-reply-to:organization:user-agent; bh=R8prhsyTGoe1yMjM6piG3MV5TqZ9RFVZIPFTCOV4LPg=; b=AUejsLA76S4zqYdyEuJ6l0sT2deGrZoN2/jmMGXLSagnbVivXF0OB+e0jujYmvmJaY ipaB9OnzA2cL996vYVlHz+YPPtCe7XADpHjUCSZszEYl/OAcKnG/LDH6zi5n0ooIcWu/ uN/S4F1BU/Lv3nBqf+55GeNW9T6pWLdWaN0fw=
- Organization: Departament of Economics and Business, Universitat Pompeu Fabra
* Federico Bruni, fede@xxxxxxxxxxxxx [12/05/17 14:08]:
>
> After doing a three-way merge of your first patch, I see that the
> patch was based on this commit:
>
> 2c37265b2a7575157f95bbda12de17cbdfd2611b
>
> instead of the last:
>
> 0966c6ab4c54cdb23bd318a7595782858eb06658
>
> So you did not rebase against remote translation before making the
Yes, that's it. Well, I created a new set of patches after (I think) I
have a correctly rebased branch.
Now, when I ran "git format-patch origin" it created ten patches with
staff that was not created by me, only the last file contains my
patches, I checked again that my branch did not have errors when
compiling the documentation. It is here:
http://puna.upf.edu/Catalan_May_14_2017.zip
--
Walter Garcia-Fontes
L'Hospitalet de Llobregat