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

Translates - French #154

Merged
merged 48 commits into from
Apr 21, 2024
Merged

Conversation

Alfred-Neuman
Copy link

@Alfred-Neuman Alfred-Neuman commented Apr 4, 2024

Translate French

Good repo this time ;)

The deletions are not mine.
It's after a repo update.
These are just indentations

@SilenceIsFatto SilenceIsFatto changed the base branch from stable to unstable April 4, 2024 22:46
@Alfred-Neuman Alfred-Neuman changed the title Translates -French Translates - French Apr 5, 2024
@SilenceIsFatto
Copy link
Owner

In future, use the unstable branch for your PRs. Stable is back at 10.5.0, unstable is currently at ~10.6.4. Helps avoid merge conflicts

@Alfred-Neuman
Copy link
Author

Alfred-Neuman commented Apr 13, 2024

Hello

I didn't add a translation today.
I must have made a mistake.

very sorry for the conflit

@SilenceIsFatto
Copy link
Owner

Conflict is resolved, they tend to happen when working with a lot of files that change somewhat frequently

Copy link
Owner

@SilenceIsFatto SilenceIsFatto left a comment

Choose a reason for hiding this comment

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

Looks generally fine, will do some testing when possible

Copy link
Owner

@SilenceIsFatto SilenceIsFatto left a comment

Choose a reason for hiding this comment

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

Looks fine, no errors on startup or mission init

@SilenceIsFatto SilenceIsFatto merged commit 2ef5d88 into SilenceIsFatto:unstable Apr 21, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants