ardanlabs / gotour

Apache License 2.0
100 stars 60 forks source link

[Translation] [spanish]: update branch with recent changes #239

Closed mdelapenya closed 8 months ago

mdelapenya commented 8 months ago

Including the following commits:

I also resolved conflicts regarding the addition of the German translation, and the vendored dependencies.

mdelapenya commented 8 months ago

@pjcalvo a new update for the Spanish lang, this one just updating it with the recent changes in main.

@ardan-bkennedy I wonder if it's possible to merge a language branch without making it public, so that the changes in the core are applied to that WIP language when they are introduced. Otherwise, we have to go resolving conflicts and keeping track of the changes manually trying not to forget any of them. You know, manually resolving conflicts could lead to mistakes.

pjcalvo commented 8 months ago

This is a good idea... would be easier to resolve problems

pjcalvo commented 8 months ago

@mdelapenya i am going to merge this Pr, can u open an issue and tag Bill to discuss if there is a solution to merge branches without making the language public .

Thanks

mdelapenya commented 8 months ago

Done in https://github.com/ardanlabs/gotour/issues/240, thanks!