Hi Maren, I don't seem to have the "rebase" button anywhere. I did find a setting to configure fast-forward merge, which is supposed to give me the option to rebase. I followed these instructions from StackOverflow: Gitlab set the merge request to use rebase instead of merge https://stackoverflow.com/questions/68063325/gitlab-set-the-merge-request-to-use-rebase-instead-of-merge
I closed my previous merge request and opened #6500 https://gitlab.com/inkscape/inkscape/-/merge_requests/6500 -- *Lucas Vieites https://namedrop.io/lucasvieites* Blog @ codexion.com https://blog.codexion.com/ LinkedIn https://www.linkedin.com/in/lucasvieites
On Sun, May 26, 2024 at 5:09 PM Maren Hachmann maren@goos-habermann.de wrote:
Hi Lucas,
do you have the rebase button available? If so, pressing it will probably resolve the failed pipeline.
Note that your merge request is for the master branch, please ensure that your translations will also go into 1.4.x (ask for a backport).
Thanks for your work! (I can't approve anything, not in dev team) Maren
Am 25.05.24 um 21:25 schrieb Lucas Vieites:
Hi there, I just finished my translation of the Spanish es.po file, and I created merge request https://gitlab.com/inkscape/inkscape/-/merge_requests/6495 https://gitlab.com/inkscape/inkscape/-/merge_requests/6495 The pipelines will probably fail as I haven't figured out how to keep my fork updated with the source project.
Please approve as needed.
Thank you in advance,
*Lucas Vieites https://namedrop.io/lucasvieites* Blog @ codexion.com https://blog.codexion.com/ LinkedIn https://www.linkedin.com/in/lucasvieites
On Thu, May 9, 2024 at 3:54 PM Maren Hachmann <maren@goos-habermann.de mailto:maren@goos-habermann.de> wrote:
Hi everyone! The last big changes to strings for Inkscape 1.4 have just beenmerged
(May 5 and today - I've done a big cleanup of hard-to-understand, unnecessary or broken strings, and we've worked on the Help menu). From now on, you can expect strings for 1.4.x to be mostly stable, and only small changes to be made, if any, before the release. There is one bug here: https://gitlab.com/inkscape/inbox/-/issues/10324 <https://gitlab.com/inkscape/inbox/-/issues/10324>, which, if fixed, would potentially invalidate a huge number of tooltip / action strings. I made a note there to better postpone that fix to Inkscape 1.4.1. So, those of you who have already started translating, please update your po files - and everyone else, you can now grab the po files for 1.4.x and start the work! Latest ones from today available here:https://gitlab.com/inkscape/inkscape/-/jobs/6808956360/artifacts/download <https://gitlab.com/inkscape/inkscape/-/jobs/6808956360/artifacts/download
Place to always find the latest ones for 1.4.x:https://gitlab.com/inkscape/inkscape/-/pipelines?page=1&scope=all&re... < https://gitlab.com/inkscape/inkscape/-/pipelines?page=1&scope=all&re...
(on the right, click on download icon, then choose translationsarchive)
Thank you all very much and happy translating! Maren _______________________________________________ Inkscape Translators mailing list -- inkscape-translator@lists.inkscape.org <mailto:inkscape-translator@lists.inkscape.org> To unsubscribe send an email to inkscape-translator-leave@lists.inkscape.org <mailto:inkscape-translator-leave@lists.inkscape.org>
Inkscape Translators mailing list --
inkscape-translator@lists.inkscape.org
To unsubscribe send an email to
inkscape-translator-leave@lists.inkscape.org
Inkscape Translators mailing list -- inkscape-translator@lists.inkscape.org To unsubscribe send an email to inkscape-translator-leave@lists.inkscape.org