Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update fr_FR app translation for 3.9.0 #2704

Merged
merged 1 commit into from
Jul 12, 2022

Conversation

jujudusud
Copy link
Member

@jujudusud jujudusud commented Jul 3, 2022

Short description of changes

Updating the fr_FR application translation for 3.9.0 version.

CHANGELOG: Update fr_FR app translation for 3.9.0

Context: Fixes an issue?

Fixes #2694

Does this change need documentation? What needs to be documented and how?

No

Status of this Pull Request

To be merged before 3.9.0 release

What is missing until this pull request can be merged?

  • Waiting for a review

Checklist

  • I've verified that this Pull Request follows the general code principles
  • I tested my code and it does what I want
  • My code follows the style guide
  • I waited some time after this Pull Request was opened and all GitHub checks completed without errors.
  • I've filled all the content above

@jujudusud jujudusud requested review from trebmuh and pljones July 3, 2022 14:33
@jujudusud jujudusud added this to the Release 3.9.0 milestone Jul 3, 2022
@jujudusud jujudusud added the translation used by tools/create-translation-issues.sh label Jul 3, 2022
@jujudusud jujudusud self-assigned this Jul 3, 2022
@jujudusud jujudusud marked this pull request as draft July 3, 2022 14:35
@ann0see
Copy link
Member

ann0see commented Jul 4, 2022

@jujudusud
First of all thanks for the speed ;-).

Why is this PR set to draft? Do you still plan to change something?

@jujudusud
Copy link
Member Author

Why is this PR set to draft? Do you still plan to change something?

No, nothing. I will turn it to ready for review.

@jujudusud jujudusud marked this pull request as ready for review July 4, 2022 08:12
@pljones
Copy link
Collaborator

pljones commented Jul 4, 2022

Thanks! Great to get so much more of the French translation done. Just the big thing of sticking to annuaire for Directory through out. If you could check all the existing translations, too, to remove serveur for Directory translations (whether or not Custom), that'd be really great! :)

@@ -2515,7 +2515,7 @@ Nous avons coupé votre canal et activé "Me silencer". Veuillez d&apo
<message>
<location filename="../connectdlg.cpp" line="75"/>
<source>The Connection Setup window lists the available servers registered with the selected directory. Use the Directory dropdown to change the directory, find the server you want to join in the server list, click on it, and then click the Connect button to connect. Alternatively, double click on the server name to connect.</source>
<translation>La fenêtre de configuration de la connexion répertorie les serveurs disponibles enregistrés dans l&apos;annuaire sélectionné. Utilisez la liste déroulante Annuaires pour changer de serveur annuaire, trouvez le serveur que vous voulez rejoindre dans la liste, cliquez dessus, puis cliquez sur le bouton Connect pour vous connecter. Vous pouvez également double-cliquer sur le nom du serveur pour vous connecter.</translation>
<translation>La fenêtre de configuration de la connexion répertorie les serveurs disponibles enregistrés dans l&apos;annuaire sélectionné. Utilisez la liste déroulante Annuaires pour changer d&apos;annuaire, trouvez le serveur que vous voulez rejoindre dans la liste, cliquez dessus, puis cliquez sur le bouton Se connecter pour vous connecter. Vous pouvez également double-cliquer sur le nom du serveur pour vous connecter.</translation>
Copy link
Collaborator

@pljones pljones Jul 4, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Mm, here the UI label in English is Directory. I've not checked the French but la liste déroulante Annuaires would then need to use the singlular.

(edit: Ah, it's filename="../connectdlgbase.ui" line="35, Annuaire, so yes, it needs to match here.)

(And yes, we could do with a tool that makes this kind of cross-referencing ... not a problem.)

@pljones
Copy link
Collaborator

pljones commented Jul 4, 2022

Brilliant, thanks for that - just caught a couple more.

@pljones
Copy link
Collaborator

pljones commented Jul 6, 2022

Looks like something went wrong. You've got a pull request against somewhere that's causing a later change to be shown in the diff.

Can you do:

  • git status
    (check you've no pending changes)
  • git checkout master
    (in case you weren't there)
  • git pull upstream master
    (to get the latest changes in your repo)
  • git checkout translate-r3_9_0-french
    (to get back to your branch)
  • git rebase -i master
    (this should list only one commit - the one containing your translations; delete anything spurious, leaving just that one; if that goes wrong... shout for help)
  • git diff master
    (this should show only your changes - if there are any others, again, shout for help)
  • git push --force
    (to get your updated local change into your github repo, replacing what's there)

If you had the "clean" commit (where git diff SOMEMASTERCOMMIT..SOMELOSTCOMMIT shows exactly what you expect), you could use git reset --hard to move the HEAD of your branch to that point, and then rebase again from there to see if it cleans things up.

@jujudusud jujudusud force-pushed the translate-r3_9_0-french branch from 4be25ef to c099f27 Compare July 6, 2022 17:57
@jujudusud
Copy link
Member Author

Hum, I'm already stuck with the parse error. I will try to reset.

@jujudusud jujudusud force-pushed the translate-r3_9_0-french branch 2 times, most recently from 1dc10ea to edb8503 Compare July 7, 2022 16:48
src/translation/translation_fr_FR.ts Outdated Show resolved Hide resolved
@jujudusud jujudusud requested a review from ann0see July 8, 2022 13:36
@ann0see
Copy link
Member

ann0see commented Jul 8, 2022

  • Translator listed in the src/util.cpp
  • Punctuation and spacing consistent
  • Signal words consistent ("ASIO", "Buffer")
  • No untranslated strings (grep unfinished -5 src/translation/translation_$TRANSLTION*.ts) (not checked)
  • Only a single .ts file checked in (+ Installer translations)

@ann0see
Copy link
Member

ann0see commented Jul 8, 2022

Ok. @jujudusud i seems as if the following isn't finished yet:

        <translation>Démarrage minimisé au lancement du système d&apos;exploitation</translation>
    </message>
    <message>
        <location filename="../serverdlg.cpp" line="737"/>
        <source>Now a directory</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
        <source>Make My Server Public</source>
        <translation type="vanished">Rendre mon serveur public</translation>
    </message>
--
        <translation>Inscrit</translation>
    </message>
    <message>
        <location filename="../util.h" line="648"/>
        <source>Directory server list full</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
        <source>Directory Server full</source>
        <translation type="vanished">Serveur annuaire plein</translation>
    </message>

I think there's an issue with the Now a directory line.

@ann0see ann0see self-requested a review July 8, 2022 14:31
Copy link
Member

@ann0see ann0see left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Could you please download and check if the app shows the Now a directory correctly and if it's duplicated?

@jujudusud jujudusud requested review from ann0see and pljones July 9, 2022 23:21
@trebmuh
Copy link
Member

trebmuh commented Jul 10, 2022

Sorry @jujudusud , I probably won't have time to review this PR because this month is the busiest month of the year in my daily job. See you next time then! 😎

@ann0see ann0see removed the request for review from trebmuh July 10, 2022 10:31
Update fr_FR app translation for 3.9.0

Update fr_FR app translation for 3.9.0

Update fr_FR app translation for 3.9.0
@jujudusud jujudusud force-pushed the translate-r3_9_0-french branch from 90716b4 to 94b53a4 Compare July 10, 2022 17:48
@jujudusud
Copy link
Member Author

jujudusud commented Jul 10, 2022

This last commit is a squash merge of the four precedent commits.

Copy link
Collaborator

@pljones pljones left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks okay to me now.

Copy link
Member

@ann0see ann0see left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Finally did the last check. Thanks and sorry for the delay

@ann0see ann0see merged commit 62bf3cc into jamulussoftware:master Jul 12, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
translation used by tools/create-translation-issues.sh
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Update fr_FR app translation for 3.9.0
4 participants