Hi Lucas,

yes, that would explain it!

I think it is possible to do that kind of merging. How exactly would depend upon the program you use to do it. I know Lokalize has an option to work on two files at the same time, so it would be quick, but manual. Other programs may have that, too.

Whether it makes sense to do it automatically probably depends upon how many different persons edited the files in between.

You can see the commit history for each file separately on GitLab, to see what others did (if any).

Hope it all works out! Maren

Am 05.06.23 um 21:18 schrieb Lucas Vieites:

Hi Maren, that's alright. I've uploaded it here: https://codexion.com/files/inkscape_1.3_poedit.png https://codexion.com/files/inkscape_1.3_poedit.png   For future reference, this is the full text of the message: ===   I'm attaching a screenshot of Poedit with the es.po file open.   In this image, you can see a couple of entries where context has been added, as you mentioned in your previous message. Those are the two entries at the top with the word "Symbol" in blue. All the other entries have a 100% match in my TM, which consists basically of entries that have been translated in previous versions. These are in orange because they are marked as "fuzzy", but you can see that the highlighted string "Color Mode" has a 100% match in the right pane, "Modo de color". ===

About the 1.2.x branch; that would explain it all. You're saying that the 1.3.x was branched out of "master", which didn't have the updated po files from 1.2.x. This is definitely the case.   Would it mess things up if I merge the inkscape.pot file with the es.po from 1.2.x? I'm going to try that and see the stats.

Thank you for thining with me on this.

Cheers,

*Lucas Vieites https://namedrop.io/lucasvieites* Blog @ codexion.com https://blog.codexion.com/ LinkedIn https://www.linkedin.com/in/lucasvieites

On Mon, Jun 5, 2023 at 2:38 PM Maren Hachmann <maren@goos-habermann.de mailto:maren@goos-habermann.de> wrote:

Lucas, I wanted to approve your held message with the screenshot,
but it
seemed gone...
    Maren

Am 05.06.23 um 14:28 schrieb Maren Hachmann:
 > I see.
 >
 > One other thing you could check:
 >
 > Maybe your translations that contain those words have only been
added to
 > the 1.2.x branch. Do you see a difference with the 1.2.x
translation files?
 >
 >   Maren
 >
 > Am 05.06.23 um 10:19 schrieb Lucas Vieites:
 >>    Hi there,
 >>    I'm attaching a screenshot of Poedit with the es.po file open.
 >>    In this image, you can see a couple of entries where context has
 >> been added, as you mentioned in your previous message. Those are
the
 >> two entries at the top with the word "Symbol" in blue. All the
other
 >> entries have a 100% match in my TM, which consists basically of
 >> entries that have been translated in previous versions. These
are in
 >> orange because they are marked as "fuzzy", but you can see that the
 >> highlighted string "Color Mode" has a 100% match in the right pane,
 >> "Modo de color".
 >>
 >> inkscape_1.3_poedit.png
 >>
 >>    I hope this helps.
 >>
 >>    Thank you , and kind regards,
 >> --
 >> *Lucas Vieites <https://namedrop.io/lucasvieites
<https://namedrop.io/lucasvieites>>*
 >> Blog @ codexion.com <http://codexion.com>
<https://blog.codexion.com/ <https://blog.codexion.com/>>
 >> LinkedIn <https://www.linkedin.com/in/lucasvieites
<https://www.linkedin.com/in/lucasvieites>>
 >>
 >>
 >> On Sun, Jun 4, 2023 at 2:53 PM Maren Hachmann
<maren@goos-habermann.de <mailto:maren@goos-habermann.de>
 >> <mailto:maren@goos-habermann.de
<mailto:maren@goos-habermann.de>>> wrote:
 >>
 >>     Hi Lucas,
 >>
 >>     yeah, that looks like a lot.
 >>
 >>     Do you have any concrete examples? That would make it easier to
 >> check.
 >>
 >>     Note that even in the previously 100% translated German,
there were
 >>     around 700 changed / new strings (and it looks correct to me).
 >>
 >>     In many cases, a context has been added to help translators,
which
 >> may
 >>     account for the 100% matches.
 >>
 >>     We've done quite a bit of cleanup. I think it is probably
correct,
 >> but
 >>     an example (or multiple) will help verify.
 >>
 >>        Regards
 >>        Maren
 >>
 >>     Am 04.06.23 um 09:07 schrieb Lucas Vieites:
 >>      >    Hi Maren,
 >>      >    The es.po file has too many fuzzy and new strings that
I think
 >>     have
 >>      > already been translated. Many of these have a 100% match
in my
 >>      > translation memory.
 >>      >    The es.po file has 2000+ pending strings, which is
~20% of the
 >>     file.
 >>      > It feels like it's too much, even for a new "big number"
release.
 >>      >
 >>      >
 >>      >    Kind regards,
 >>      > --
 >>      > Lucas Vieites
 >>      > lucasvieites@gmail.com <mailto:lucasvieites@gmail.com>
<mailto:lucasvieites@gmail.com <mailto:lucasvieites@gmail.com>>
 >>     <mailto:lucasvieites@gmail.com
<mailto:lucasvieites@gmail.com> <mailto:lucasvieites@gmail.com
<mailto:lucasvieites@gmail.com>>>
 >>      >
 >>      > On Sat, Jun 3, 2023, 15:09 Maren Hachmann
 >>     <maren@goos-habermann.de <mailto:maren@goos-habermann.de>
<mailto:maren@goos-habermann.de <mailto:maren@goos-habermann.de>>
 >>      > <mailto:maren@goos-habermann.de
<mailto:maren@goos-habermann.de>
 >>     <mailto:maren@goos-habermann.de
<mailto:maren@goos-habermann.de>>>> wrote:
 >>      >
 >>      >     Hi Lucas,
 >>      >
 >>      >     what makes you think the file isn't up-to-date?
 >>      >
 >>      >        Maren
 >>      >
 >>      >     Am 03.06.23 um 12:27 schrieb Lucas Vieites:
 >>      >      >    Hi there,
 >>      >      >    regarding the string freeze; any idea when we
can start
 >>      >     downloading
 >>      >      > the correct /translations.zip/ file? Currently, the po
 >>     file for
 >>      >     Spanish
 >>      >      > dos not seem up to date.
 >>      >      >    I got it from
 >>      >      >
 >>      >
 >>
 >>
https://gitlab.com/inkscape/inkscape/-/jobs/artifacts/1.3.x/download?job=translations <https://gitlab.com/inkscape/inkscape/-/jobs/artifacts/1.3.x/download?job=translations> <https://gitlab.com/inkscape/inkscape/-/jobs/artifacts/1.3.x/download?job=translations <https://gitlab.com/inkscape/inkscape/-/jobs/artifacts/1.3.x/download?job=translations>> <https://gitlab.com/inkscape/inkscape/-/jobs/artifacts/1.3.x/download?job=translations <https://gitlab.com/inkscape/inkscape/-/jobs/artifacts/1.3.x/download?job=translations> <https://gitlab.com/inkscape/inkscape/-/jobs/artifacts/1.3.x/download?job=translations <https://gitlab.com/inkscape/inkscape/-/jobs/artifacts/1.3.x/download?job=translations>>> <https://gitlab.com/inkscape/inkscape/-/jobs/artifacts/1.3.x/download?job=translations <https://gitlab.com/inkscape/inkscape/-/jobs/artifacts/1.3.x/download?job=translations> <https://gitlab.com/inkscape/inkscape/-/jobs/artifacts/1.3.x/download?job=translations <https://gitlab.com/inkscape/inkscape/-/jobs/artifacts/1.3.x/download?job=translations>> <https://gitlab.com/inkscape/inkscape/-/jobs/artifacts/1.3.x/download?job=translations <https://gitlab.com/inkscape/inkscape/-/jobs/artifacts/1.3.x/download?job=translations> <https://gitlab.com/inkscape/inkscape/-/jobs/artifacts/1.3.x/download?job=translations <https://gitlab.com/inkscape/inkscape/-/jobs/artifacts/1.3.x/download?job=translations>>>>
 >>      >      >
 >>      >      >    Thank you,
 >>      >      > --
 >>      >      > *Lucas Vieites <https://namedrop.io/lucasvieites
<https://namedrop.io/lucasvieites>
 >>     <https://namedrop.io/lucasvieites
<https://namedrop.io/lucasvieites>>
 >>      >     <https://namedrop.io/lucasvieites
<https://namedrop.io/lucasvieites>
 >>     <https://namedrop.io/lucasvieites
<https://namedrop.io/lucasvieites>>>>*
 >>      >      > Blog @ codexion.com <http://codexion.com>
<http://codexion.com <http://codexion.com>>
 >>     <http://codexion.com <http://codexion.com>
<http://codexion.com <http://codexion.com>>>
 >>      >     <https://blog.codexion.com/
<https://blog.codexion.com/> <https://blog.codexion.com/
<https://blog.codexion.com/>>
 >>     <https://blog.codexion.com/ <https://blog.codexion.com/>
<https://blog.codexion.com/ <https://blog.codexion.com/>>>>
 >>      >      > LinkedIn <https://www.linkedin.com/in/lucasvieites
<https://www.linkedin.com/in/lucasvieites>
 >>     <https://www.linkedin.com/in/lucasvieites
<https://www.linkedin.com/in/lucasvieites>>
 >>      >     <https://www.linkedin.com/in/lucasvieites
<https://www.linkedin.com/in/lucasvieites>
 >>     <https://www.linkedin.com/in/lucasvieites
<https://www.linkedin.com/in/lucasvieites>>>>
 >>      >      >
 >>      >      >
 >>      >      > On Wed, May 31, 2023 at 1:07 AM Maren Hachmann
 >>      >     <maren@goos-habermann.de
<mailto:maren@goos-habermann.de> <mailto:maren@goos-habermann.de
<mailto:maren@goos-habermann.de>>
 >>     <mailto:maren@goos-habermann.de
<mailto:maren@goos-habermann.de> <mailto:maren@goos-habermann.de
<mailto:maren@goos-habermann.de>>>
 >>      >      > <mailto:maren@goos-habermann.de
<mailto:maren@goos-habermann.de>
 >>     <mailto:maren@goos-habermann.de
<mailto:maren@goos-habermann.de>>
 >>      >     <mailto:maren@goos-habermann.de
<mailto:maren@goos-habermann.de>
 >>     <mailto:maren@goos-habermann.de
<mailto:maren@goos-habermann.de>>>>> wrote:
 >>      >      >
 >>      >      >     Hi Translators,
 >>      >      >
 >>      >      >     we've just released the beta for Inkscape 1.3,
and also
 >>      >     published a
 >>      >      >     news
 >>      >      >     article for it:
 >>      >      >
 >>      >      >
 >>      >
 >>
 >>
http://www.inkscape.org/news/2023/05/30/inkscape-reveals-tools-organizing-efficiently-beta/ <http://www.inkscape.org/news/2023/05/30/inkscape-reveals-tools-organizing-efficiently-beta/> <http://www.inkscape.org/news/2023/05/30/inkscape-reveals-tools-organizing-efficiently-beta/ <http://www.inkscape.org/news/2023/05/30/inkscape-reveals-tools-organizing-efficiently-beta/>> <http://www.inkscape.org/news/2023/05/30/inkscape-reveals-tools-organizing-efficiently-beta/ <http://www.inkscape.org/news/2023/05/30/inkscape-reveals-tools-organizing-efficiently-beta/> <http://www.inkscape.org/news/2023/05/30/inkscape-reveals-tools-organizing-efficiently-beta/ <http://www.inkscape.org/news/2023/05/30/inkscape-reveals-tools-organizing-efficiently-beta/>>> <http://www.inkscape.org/news/2023/05/30/inkscape-reveals-tools-organizing-efficiently-beta/ <http://www.inkscape.org/news/2023/05/30/inkscape-reveals-tools-organizing-efficiently-beta/> <http://www.inkscape.org/news/2023/05/30/inkscape-reveals-tools-organizing-efficiently-beta/ <http://www.inkscape.org/news/2023/05/30/inkscape-reveals-tools-organizing-efficiently-beta/>> <http://www.inkscape.org/news/2023/05/30/inkscape-reveals-tools-organizing-efficiently-beta/ <http://www.inkscape.org/news/2023/05/30/inkscape-reveals-tools-organizing-efficiently-beta/> <http://www.inkscape.org/news/2023/05/30/inkscape-reveals-tools-organizing-efficiently-beta/ <http://www.inkscape.org/news/2023/05/30/inkscape-reveals-tools-organizing-efficiently-beta/>>>>
 >>      >      >
 >>      >      >     If you are a website translator and have a little
 >> bit of
 >>      >     time, please
 >>      >      >     help by translating the article to your language!
 >>      >      >
 >>      >      >     --------------------------------
 >>      >      >
 >>      >      >     About translating for Inkscape 1.3:
 >>      >      >
 >>      >      >     The bulk of the changes is now in, but string
freeze
 >> will
 >>      >     officially
 >>      >      >     only start in a few days (expected for next
Monday).
 >>     So if you'd
 >>      >      >     like to
 >>      >      >     start on translations, you can, but expect
some smaller
 >>      >     changes to
 >>      >      >     still
 >>      >      >     happen, that may invalidate (fuzzy-fy) some of
your
 >>     translations.
 >>      >      >
 >>      >      >     Note that now two branches exist again,
'master' and
 >>     '1.3.x'.
 >>      >     Remember
 >>      >      >     to ask for your translations to be included in
both,
 >>     and to check
 >>      >      >     whether that has actually happened.
 >>      >      >
 >>      >      >     I'll update links on the Wiki / translation
statistics
 >>     after the
 >>      >      >     official string freeze.
 >>      >      >
 >>      >      >     Thanks everyone!
 >>      >      >        Maren
 >>      >      >     _______________________________________________
 >>      >      >     Inkscape Translators mailing list --
 >>      >      > inkscape-translator@lists.inkscape.org
<mailto:inkscape-translator@lists.inkscape.org>
 >>     <mailto:inkscape-translator@lists.inkscape.org
<mailto:inkscape-translator@lists.inkscape.org>>
 >>      >     <mailto:inkscape-translator@lists.inkscape.org
<mailto:inkscape-translator@lists.inkscape.org>
 >>     <mailto:inkscape-translator@lists.inkscape.org
<mailto:inkscape-translator@lists.inkscape.org>>>
 >>      >      >     <mailto:inkscape-translator@lists.inkscape.org
<mailto:inkscape-translator@lists.inkscape.org>
 >>     <mailto:inkscape-translator@lists.inkscape.org
<mailto:inkscape-translator@lists.inkscape.org>>
 >>      >     <mailto:inkscape-translator@lists.inkscape.org
<mailto:inkscape-translator@lists.inkscape.org>
 >>     <mailto: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>
 >>     <mailto:inkscape-translator-leave@lists.inkscape.org
<mailto:inkscape-translator-leave@lists.inkscape.org>>
 >>      >     <mailto:inkscape-translator-leave@lists.inkscape.org
<mailto:inkscape-translator-leave@lists.inkscape.org>
 >>     <mailto:inkscape-translator-leave@lists.inkscape.org
<mailto:inkscape-translator-leave@lists.inkscape.org>>>
 >>      >      >   
  <mailto:inkscape-translator-leave@lists.inkscape.org
<mailto:inkscape-translator-leave@lists.inkscape.org>
 >>     <mailto:inkscape-translator-leave@lists.inkscape.org
<mailto:inkscape-translator-leave@lists.inkscape.org>>
 >>      >     <mailto:inkscape-translator-leave@lists.inkscape.org
<mailto:inkscape-translator-leave@lists.inkscape.org>
 >>     <mailto:inkscape-translator-leave@lists.inkscape.org
<mailto:inkscape-translator-leave@lists.inkscape.org>>>>
 >>      >      >
 >>      >      >
 >>      >      > _______________________________________________
 >>      >      > Inkscape Translators mailing list --
 >>      > inkscape-translator@lists.inkscape.org
<mailto:inkscape-translator@lists.inkscape.org>
 >>     <mailto:inkscape-translator@lists.inkscape.org
<mailto:inkscape-translator@lists.inkscape.org>>
 >>      >     <mailto:inkscape-translator@lists.inkscape.org
<mailto:inkscape-translator@lists.inkscape.org>
 >>     <mailto: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>
 >>     <mailto:inkscape-translator-leave@lists.inkscape.org
<mailto:inkscape-translator-leave@lists.inkscape.org>>
 >>      >     <mailto:inkscape-translator-leave@lists.inkscape.org
<mailto:inkscape-translator-leave@lists.inkscape.org>
 >>     <mailto:inkscape-translator-leave@lists.inkscape.org
<mailto:inkscape-translator-leave@lists.inkscape.org>>>
 >>      >
 >>      >     _______________________________________________
 >>      >     Inkscape Translators mailing list --
 >>      > inkscape-translator@lists.inkscape.org
<mailto:inkscape-translator@lists.inkscape.org>
 >>     <mailto:inkscape-translator@lists.inkscape.org
<mailto:inkscape-translator@lists.inkscape.org>>
 >>      >     <mailto:inkscape-translator@lists.inkscape.org
<mailto:inkscape-translator@lists.inkscape.org>
 >>     <mailto: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>
 >>     <mailto:inkscape-translator-leave@lists.inkscape.org
<mailto:inkscape-translator-leave@lists.inkscape.org>>
 >>      >     <mailto:inkscape-translator-leave@lists.inkscape.org
<mailto:inkscape-translator-leave@lists.inkscape.org>
 >>     <mailto:inkscape-translator-leave@lists.inkscape.org
<mailto:inkscape-translator-leave@lists.inkscape.org>>>
 >>      >
 >>      >
 >>      > _______________________________________________
 >>      > Inkscape Translators mailing list --
 >> inkscape-translator@lists.inkscape.org
<mailto:inkscape-translator@lists.inkscape.org>
 >>     <mailto: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>
 >>     <mailto:inkscape-translator-leave@lists.inkscape.org
<mailto:inkscape-translator-leave@lists.inkscape.org>>
 >>
 >
 >
 > _______________________________________________
 > 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
<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