Spelling error in the Welcome app

anon81650314 · October 30, 2021, 1:51pm

Hello,
I would like to report a spelling / grammar error in the French version of the Welcome program, version 3.16.9-1, of the XFCE version of Endeavor OS. The error is on the button that takes the user to the EndeavorOS software news page.

First, the spelling of the word software in french is incorrect; we say logiciel (it’s a masculine word; logiciels in plural).
Second, we must put a preposition between Nouvelles and logiciel; preposition which will be here in the plural because it deals with several software related to Endeavour OS. So it’s gonna be “des”.

To correctly say it, we must say “Nouvelles des logiciels” and not “Nouvelles logicielles”. Or better: “Nouvelles du système” to be more global and since Endeavor is an operating system.

Best regards.

Zircon34 · October 30, 2021, 2:31pm

Just found a typo

It’s logiciels

joekamprad · October 30, 2021, 2:39pm

github.com

endeavouros-team/PKGBUILDS/blob/master/eos-translations/translation-fr.bash

# Traduction de l'application Welcome
#
# Note : variables (voir $PRETTY_PROGNAME ci-dessous) peuvent-être utilisées si elles sont déjà définies dans soit l'un soit l'autre
# - dans l'application Welcome
# - globalement
#
#
# Chaque chaîne de caractères doit-être définie ainsi :
#
#    _tr_add <language> <placeholder> "string"
#          ou bien
#    _tr_add2 <placeholder> "string"
#
# où
#
#    _tr_add         Une fonction bash ajoute une "chaîne" à la base de données des chaînes de caractères.
#    _tr_add2        Identique à _tr_add mais connaît la langue à partir de la variable _tr_lang (ci-dessous).
#    <language>      Un acronyme pour la langue, ex. "fr" pour le françcais (vérifiez la variable LANG !).
#    <placeholder>   Un nom prédéfini qui identifie l'endroit dans l'application Welcome où cette chaîne est utilisée.
#    "string"        La chaîne de caractère traduite pour l'application Welcome.

This file has been truncated. show original

Please create a Pull Request

anon81650314 · October 30, 2021, 2:43pm

Oh, Thanks

anon81650314 · October 30, 2021, 2:48pm

Thanks for your answer, but I’m just an average user. I came here in the first place because I don’t know how to handle this kind of documents / scripts and submit them.

manuel · October 30, 2021, 3:04pm

@Halpr
Thanks for the report!

@FredBezies has done our French translations, hopefully he sees this now and has time to handle it.

ricklinux · October 30, 2021, 3:09pm

Oh mon Dieu! Une erreur? Zut Alors!

anon81650314 · October 30, 2021, 3:12pm

Ok, thank you.
I didn’t know Fred was contributing too.
I use to watch Fred’s peertube channel and read his weblog, it’s very instructive and useful.

Zircon34 · October 30, 2021, 3:14pm

I just did a git clone, and will do a git commit/push, my first contribution to EOS! assuming Fred is not faster than me.

manuel · October 30, 2021, 3:16pm

Thanks! Always great to see contributions!

Zircon34 · October 30, 2021, 3:31pm

just one question, I did edit the file and a git commit. After that do I need to do a git push? I am in the eos-translations directory.

edit: not sure, I can’t git push because I am not a developer of this project. I guess I must do a git pull request, not enought versed in git…

FredBezies · October 30, 2021, 3:35pm

Well, I was busy with something else. This is the kind of typo that are hard to find!

Zircon34 · October 30, 2021, 3:46pm

just a question, do I need to really fork the project to be able to contribute to do a pull request?

found these instructions:

https://kbroman.org/github_tutorial/pages/fork.html

That would be a good opportunity to contribute in the future If I can/find something

edit: ok forked, committed, and pushed, just learned something. Hopefully that was correct. created the pull request. That was all new to me, as I never forked.

joekamprad · October 30, 2021, 5:21pm

yes looks perfect!
And you can also simply start editing and it will fork on its own, and after your PR is merged you can remove the fork again …

manuel · October 30, 2021, 5:54pm

Merged, thanks!

And the new version 1.1.43-1 should be on mirrors soon.

anon81650314 · October 30, 2021, 6:07pm

On ne peut pas être au four et au moulin !

anon81650314 · October 30, 2021, 6:07pm

Thank you !

Zircon34 · October 31, 2021, 4:41pm

Is that something that would be preferred? I don’t want to look like I am forking EOS and trying to make a new distro, this is well beyond my pedigree

Just seems easy, in case I can contribute something, I can git pull on my computer and the fork is directly linked to EOS, and when I push it goes to my repo, and can make a pull request. Hopefully I haven’t misunderstood too much how git works. I need to learn this more since I am planning on contributing code in the future (including/mostly on other scientific projects).

joekamprad · October 31, 2021, 4:45pm

basically it works like so… if you clone your fork it is connected to your fork.
But if you keep the fork and want to PR later on the same repo you will need to update with original repo before that, so it is more easy and clean to remove your fork after PR and if you want to contribute again you fork again…

Zircon34 · October 31, 2021, 4:51pm

OK thanks!

Edit: well the only way to unfork was to remove the forked repo. Not sure this is effective, since the remote repo was linked to the forked one (following the tutorial I linked above) and update was one command away, git pull pulled from eos, git push pushed to the forked repo on my github account. Now my local folder cannot be used to push changes/commit changes. Not sure how it would create a fork each time I push a change. I will have to read up more about git.

Just wondering if it would make sense for a mini tutorial/how to contribute to eos on github and best practice. If not already in our wiki list.