Forking Inkscape on gitlab to work on translations
Hello,
I'm the current Italian translator for Inkscape. In the last years I worked alone on the translations, but now I have been contacted by some users that would like to contribute to the translation work.
I created a fork on gitlab for Inkscape: https://gitlab.com/FirasH/inkscape
and for Inkscape documentation: https://gitlab.com/FirasH/documentation
but I don't know how to configure my fork to do the following: 1) keep it up to date with master and 0.92.x except for the translation files
I added the original repo as mirrored, but as soon as I push a commit request I get an error due to mismatch between my fork and the original one (mirrored).
2) keep the "names" of the people who contributed to my fork in the commits (that I will review, then create a merge request)
Thanks in advance, Firas
On Mon, Jul 23, 2018 at 06:17:34PM +0200, Firas Hanife wrote:
Hello,
I'm the current Italian translator for Inkscape. In the last years I worked alone on the translations, but now I have been contacted by some users that would like to contribute to the translation work.
I created a fork on gitlab for Inkscape: https://gitlab.com/FirasH/inkscape
and for Inkscape documentation: https://gitlab.com/FirasH/documentation
but I don't know how to configure my fork to do the following:
- keep it up to date with master and 0.92.x except for the translation
files
I added the original repo as mirrored, but as soon as I push a commit request I get an error due to mismatch between my fork and the original one (mirrored).
Do your work on a branch off your forked version, and that should avoid that I think. Setting it up as a mirror should work ok; I've done this in other projects.
However, I don't think this is a typical workflow that translators use, so hopefully they can share some other approaches that might work better for you. For code development, many people craft their branch off the main Inkscape repo rather than off their own mirror; this tends to be simpler to set up, and (I think?) easier to send merge requests from. But again the translation team can probably give you more practical advice for your particular need.
Bryce
- keep the "names" of the people who contributed to my fork in the commits
(that I will review, then create a merge request)
Thanks in advance, Firas
Check out the vibrant tech community on one of the world's most engaging tech sites, Slashdot.org! http://sdm.link/slashdot
Inkscape-translator mailing list Inkscape-translator@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/inkscape-translator
Am 23.07.2018 um 19:35 schrieb Bryce Harrington:
On Mon, Jul 23, 2018 at 06:17:34PM +0200, Firas Hanife wrote:
Hello,
I'm the current Italian translator for Inkscape. In the last years I worked alone on the translations, but now I have been contacted by some users that would like to contribute to the translation work.
I created a fork on gitlab for Inkscape: https://gitlab.com/FirasH/inkscape
and for Inkscape documentation: https://gitlab.com/FirasH/documentation
but I don't know how to configure my fork to do the following:
- keep it up to date with master and 0.92.x except for the translation
files
I added the original repo as mirrored, but as soon as I push a commit request I get an error due to mismatch between my fork and the original one (mirrored).
Do your work on a branch off your forked version, and that should avoid that I think. Setting it up as a mirror should work ok; I've done this in other projects.
However, I don't think this is a typical workflow that translators use, so hopefully they can share some other approaches that might work better for you. For code development, many people craft their branch off the main Inkscape repo rather than off their own mirror; this tends to be simpler to set up, and (I think?) easier to send merge requests from. But again the translation team can probably give you more practical advice for your particular need.
Hi Firas,
great that you found some support for helping with Italian (does it have to do with someone from the English Inkscape forums asking on the Italian Inkscape forums? I remember suggesting it, but haven't heard if there were any reactions.)!
For German, we have an even more manual setup, see https://github.com/Ede123/inkscape-localization . The repository only contains our own po files and not much else - that's why it also requires a lot of manual work.
I think one of the reasons for having it in a separate repo was that then we can discuss (in German) without annoying devs with it (they probably already get a headache from all my posts...).
Some time ago, Yaron suggested using Weblate, but then we were in need of someone who would want to be responsible, and discussion subsided. As it's django-based, I was just playing around with it a bit this evening locally. It seems a bit slow, from their demo page (and locally, too), but I'll play with it a bit more. Maybe we can some day set up an instance of it on one of the virtual hosts on cloudscale, and have it automatically push translation changes to a branch on gitlab.
Maren
Bryce
- keep the "names" of the people who contributed to my fork in the commits
(that I will review, then create a merge request)
Thanks in advance, Firas
Check out the vibrant tech community on one of the world's most engaging tech sites, Slashdot.org! http://sdm.link/slashdot
Inkscape-translator mailing list Inkscape-translator@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/inkscape-translator
Check out the vibrant tech community on one of the world's most engaging tech sites, Slashdot.org! http://sdm.link/slashdot _______________________________________________ Inkscape-translator mailing list Inkscape-translator@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/inkscape-translator
participants (3)
-
Bryce Harrington
-
Firas Hanife
-
Maren Hachmann