GUACAMOLE-2034: Update fr.json (rebase and complete)

[adb014]

This is a rebase and a completion of the PR #1062.

[adb014]

For information with a bit of vibe coding and horrible hacks, I tried using Argos Translate for this translation (and in fact all of the missing translation strings) The script is translate_missing2.py. It kind of worked with some layout and translation errors particularly for short phrases or where more context was needed to allow translation of an isolated sentence, otherwise it worked pretty well.

I note this here for reference if someone else wants to attack translating strings, they can get a starting point for the mising strings with my script from Argos Translate (PS it does need to download almost 15 GB of data for the language models of all the languages supportted by Guacamole). I have no pretention of being able to ensure the correct translation of other languages than French however.

Usage of my script from the root of guacamole-client

python3 translate_missing2.py fr > /tmp/guacamole-fr.diff

which creates a minimal unified diff against Guacamole

[corentin-soriano]

I agree about the translations themselves.

Is there a specific reason for putting main in the base branch rather than staging/1.6.1 (next version)?

[adb014]

I agree about the translations themselves.

Is there a specific reason for putting main in the base branch rather than staging/1.6.1 (next version)?

Well mainly 'cause I'm new to Guacamole development (though I've been a user for a while) and have no real idea of the release process. This is the same with my other PR, they are all against "main". Where is the appropriate place to base this PR and my other PR ? Does the same logic apply to guacamole-manual ?

[adb014]

I agree about the translations themselves.
Is there a specific reason for putting main in the base branch rather than staging/1.6.1 (next version)?

Well mainly 'cause I'm new to Guacamole development (though I've been a user for a while) and have no real idea of the release process. This is the same with my other PR, they are all against "main". Where is the appropriate place to base this PR and my other PR ? Does the same logique apply to guacamole-manual ?

Ok I rebased my branch and updated the pull request to staging/1.61

[corentin-soriano]

I agree about the translations themselves.
Is there a specific reason for putting main in the base branch rather than staging/1.6.1 (next version)?

Well mainly 'cause I'm new to Guacamole development (though I've been a user for a while) and have no real idea of the release process. This is the same with my other PR, they are all against "main". Where is the appropriate place to base this PR and my other PR ? Does the same logic apply to guacamole-manual ?

The main branch contains features for an upcoming 1.7.0 release.

[necouchman]

I agree about the translations themselves.
Is there a specific reason for putting main in the base branch rather than staging/1.6.1 (next version)?

Well mainly 'cause I'm new to Guacamole development (though I've been a user for a while) and have no real idea of the release process. This is the same with my other PR, they are all against "main". Where is the appropriate place to base this PR and my other PR ? Does the same logic apply to guacamole-manual ?

Our Confluence page has some more details on branching and how we do versioning within Guacamole:

https://cwiki.apache.org/confluence/display/GUAC/Version+Numbering+and+Branching+Scheme

That may help to clear some of it up. We're trying to close out for the 1.6.1 release, and squeezing the last few things in there, so Corentin was just adding this one to the growing list of fixes that go into 1.6.1, since it's very much a fix. One of these days we'll actually finish that release...

[adb014]

I agree about the translations themselves.
Is there a specific reason for putting main in the base branch rather than staging/1.6.1 (next version)?

Well mainly 'cause I'm new to Guacamole development (though I've been a user for a while) and have no real idea of the release process. This is the same with my other PR, they are all against "main". Where is the appropriate place to base this PR and my other PR ? Does the same logic apply to guacamole-manual ?

Our Confluence page has some more details on branching and how we do versioning within Guacamole:

https://cwiki.apache.org/confluence/display/GUAC/Version+Numbering+and+Branching+Scheme

That may help to clear some of it up. We're trying to close out for the 1.6.1 release, and squeezing the last few things in there, so Corentin was just adding this one to the growing list of fixes that go into 1.6.1, since it's very much a fix. One of these days we'll actually finish that release...

Ok so if I understand looking at my 3 current contributions and their corresponding contributions to guacamole-manual, if 1.6.2 is coming soon, you want the following

#1217 -> staging/1.6.1
#1216 -> main targeting 1.7.0
#1198 -> probably main but maybe staging/1.6.1 if you think the change isn’t that major

[corentin-soriano]

I think you could keep the message from the first commit as it is in #1118 (GUACAMOLE-2034 : Fix few typos, missing translation and formatting issues in french fr.json) and squash the latest commit.

[adb014]

I think you could keep the message from the first commit as it is in #1118 (GUACAMOLE-2034 : Fix few typos, missing translation and formatting issues in french fr.json) and squash the latest commit.

Ok, no problem, but what to do with the "Author" line of the commit ? With at least two commits I don't appear as the author of the modifications proposed by @YAGA29, and he doesn't appears as the author of mine.. Squashing to a single commit and only one of us is the Author

[adb014]

Ah, ok I thnk I misunderstood, you want to keep @YAGA29's commit as is and squash might... The problem is that I added my rebasing and completion into @YAGA29's commit.. Ok, on it