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

atom, clear, convert, df: sync French translations with English pages #5797

Conversation

nicokosi
Copy link
Collaborator

Fix a few fr warnings from https://lukwebsforge.github.io/tldri18n/.

@bl-ue bl-ue added the translation Translate pages from one language to another. label Apr 20, 2021
Copy link
Contributor

@bl-ue bl-ue left a comment

Choose a reason for hiding this comment

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

This type of translation PR is one of my favorite! 🧡

@marchersimon marchersimon added the page edit Changes to an existing page(s). label Apr 20, 2021
@bl-ue bl-ue changed the title Update some French pages for having the same number of entries than English pages atom, clear, convert, df: sync French translations with English pages Apr 20, 2021
@bl-ue
Copy link
Contributor

bl-ue commented Apr 20, 2021

@nicokosi FYI—I just corrected the spaces before the colons to the French thin unbreakable ones. See #5152 for details.

@bl-ue bl-ue merged commit df7770a into tldr-pages:master Apr 20, 2021
@bl-ue
Copy link
Contributor

bl-ue commented Apr 20, 2021

@nicokosi can you update your fork? It's a bit out-of-date. Here's how:

# switch to the master branch
git checkout master

# only do this step if you don't already the upstream remote (check with `git remote -v`)
git remote add upstream https://github.com/tldr-pages/tldr.git

# download the latest commits from the main repo into a temporary place
git fetch upstream master

# sync the latest commits into your fork's local master branch, in their correct order
git rebase upstream/master

# push everying up to your fork
git push

@bl-ue
Copy link
Contributor

bl-ue commented Apr 20, 2021

Also @nicokosi, will you please join our Gitter channel? You can just login using your GitHub account. I'd like to say something to you ;)

@nicokosi nicokosi deleted the fr-updates-for-having-the-same-number-of-entries-than-en branch April 21, 2021 04:40
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
page edit Changes to an existing page(s). translation Translate pages from one language to another.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants