Re: [translations] New set of Catalan translations

[Federico Bruni <fede@xxxxxxxxxxxxx>]

Il giorno ven 12 mag 2017 alle 11:22, Walter Garcia-Fontes 
<walter.garcia@xxxxxxx> ha scritto:
> I took a look to my set of patches, and there is something I don't
> understand.
>
> As far as I can tell I did all the process right. I have my own
> branch, created from the translation branch, I worked there. When I
> finished I went back to the translation branch, updated it with
> "pull", then when back to my branch, rebased it with translation
> without errors, and generated my patches.
>
> Since I was told that the patches could not be applied against the
> translation branch I checked it myself. I cloned a new repository,
> checked out the translation branch, and tried to apply my patches.
>
> They fail because some lines in the patches have trailing
> whitespaces, at 6 or 7 lines.
>
> So I went back to my branch and checked if those trailing whitespaces
> were in the corresponding files, but they are not there, but when I
> generate my patches (with "git format-patch origin") they are
> introduced. How come? I tried to erase the trailing whitespace
> directly in the patches but they still fail to apply.

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 
patch.


$ git am -3 
0001-Doc-ca-Adding-translation-of-simultaneous.itely-for-.patch
$ git diff
diff --cc Documentation/ca/learning/fundamental.itely
index e64fc57,c235ac4..0000000
--- a/Documentation/ca/learning/fundamental.itely
+++ b/Documentation/ca/learning/fundamental.itely
@@@ -974,7 -970,7 +974,11 @@@ propietat @code{force-hshift}

 @seealso
 Referència de la notació:
++<<<<<<< 0148f892be35b172d678931fe9d10f795bca3077
+@ruser{Veus múltiples}.
++=======
+ @ruser{Veus mútliples}.
++>>>>>>> Doc-ca: Adding translation of simultaneous.itely for Catalan


 @node Veus explícites
diff --cc Documentation/ca/notation/simultaneous.itely
index 45bc132,85cb3d6..0000000
--- a/Documentation/ca/notation/simultaneous.itely
+++ b/Documentation/ca/notation/simultaneous.itely
@@@ -9,8 -9,6 +9,11 @@@

 @c \version "2.19.29"

++<<<<<<< 0148f892be35b172d678931fe9d10f795bca3077
+@c Translators: Walter Garcia-Fontes
+@c Translation checkers:
++=======
++>>>>>>> Doc-ca: Adding translation of simultaneous.itely for Catalan
 @c Translation status: post-GDP

 @node Notes simultànies
@@@ -1120,7 -1118,7 +1123,11 @@@ la lletra de les cançons; si una de le
 per poder adjuntar una lletra, el combinador de parts no
 funciona.  Tanmateix, es pot aconseguir aquest efecte usant un
 context @code{NullVoice}.  Vegeu
++<<<<<<< 0148f892be35b172d678931fe9d10f795bca3077
+@rusernamed{Polyphony with shared lyrics,Polifonia amb lletres 
compartides}.
++=======
+ @rusernamed{Poliphony with shared lyrics,Polifonia amb lletres 
compartides}.
++>>>>>>> Doc-ca: Adding translation of simultaneous.itely for Catalan

 @snippets


I've fixed these conflicts and the attached patch should work fine.