Skip to content
This repository has been archived by the owner on Nov 7, 2024. It is now read-only.

New Crowdin updates #113

Open
wants to merge 123 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
123 commits
Select commit Hold shift + click to select a range
be5cf4e
New translations banner.png (French)
sashamishcheriakova Sep 26, 2024
179eb56
New translations banner.png (Japanese)
sashamishcheriakova Sep 26, 2024
b346a9b
New translations banner.png (Dutch)
sashamishcheriakova Sep 26, 2024
8192c1f
New translations clone.png (French)
sashamishcheriakova Sep 26, 2024
ecad973
New translations clone.png (Japanese)
sashamishcheriakova Sep 26, 2024
015d586
New translations clone.png (Dutch)
sashamishcheriakova Sep 26, 2024
076abc3
New translations closed.png (French)
sashamishcheriakova Sep 26, 2024
c59410e
New translations closed.png (Japanese)
sashamishcheriakova Sep 26, 2024
2ec82db
New translations closed.png (Dutch)
sashamishcheriakova Sep 26, 2024
7a5f73b
New translations download-git.png (French)
sashamishcheriakova Sep 26, 2024
2e54621
New translations download-git.png (Japanese)
sashamishcheriakova Sep 26, 2024
1d9d3c4
New translations download-git.png (Dutch)
sashamishcheriakova Sep 26, 2024
7bfca9e
New translations fork.png (French)
sashamishcheriakova Sep 26, 2024
23145a6
New translations fork.png (Japanese)
sashamishcheriakova Sep 26, 2024
a3dc75d
New translations fork.png (Dutch)
sashamishcheriakova Sep 26, 2024
b339548
New translations forking.png (French)
sashamishcheriakova Sep 26, 2024
207888b
New translations forking.png (Japanese)
sashamishcheriakova Sep 26, 2024
07bc0c5
New translations forking.png (Dutch)
sashamishcheriakova Sep 26, 2024
69e74fe
New translations gh-reg.png (French)
sashamishcheriakova Sep 26, 2024
0cdbc0f
New translations gh-reg.png (Japanese)
sashamishcheriakova Sep 26, 2024
d074148
New translations gh-reg.png (Dutch)
sashamishcheriakova Sep 26, 2024
d5bcb9c
New translations gh-repo.png (French)
sashamishcheriakova Sep 26, 2024
840822b
New translations gh-repo.png (Japanese)
sashamishcheriakova Sep 26, 2024
daaefa3
New translations gh-repo.png (Dutch)
sashamishcheriakova Sep 26, 2024
ce94dc8
New translations git-icons.png (French)
sashamishcheriakova Sep 26, 2024
d17f853
New translations git-icons.png (Japanese)
sashamishcheriakova Sep 26, 2024
aa00f3c
New translations git-icons.png (Dutch)
sashamishcheriakova Sep 26, 2024
246c0bd
New translations git-logo.png (French)
sashamishcheriakova Sep 26, 2024
ceaa639
New translations git-logo.png (Japanese)
sashamishcheriakova Sep 26, 2024
aaa6917
New translations git-logo.png (Dutch)
sashamishcheriakova Sep 26, 2024
e0e6021
New translations github-shell.png (French)
sashamishcheriakova Sep 26, 2024
6c43c43
New translations github-shell.png (Japanese)
sashamishcheriakova Sep 26, 2024
1dd25a7
New translations github-shell.png (Dutch)
sashamishcheriakova Sep 26, 2024
1e9edb0
New translations homebrew.png (French)
sashamishcheriakova Sep 26, 2024
37a55f1
New translations homebrew.png (Japanese)
sashamishcheriakova Sep 26, 2024
02a2837
New translations homebrew.png (Dutch)
sashamishcheriakova Sep 26, 2024
c2ecb9e
New translations installed-git.png (French)
sashamishcheriakova Sep 26, 2024
f4718a6
New translations installed-git.png (Japanese)
sashamishcheriakova Sep 26, 2024
8892c7a
New translations installed-git.png (Dutch)
sashamishcheriakova Sep 26, 2024
57ddfaa
New translations instructions.png (French)
sashamishcheriakova Sep 26, 2024
b09adef
New translations instructions.png (Japanese)
sashamishcheriakova Sep 26, 2024
456fb27
New translations instructions.png (Dutch)
sashamishcheriakova Sep 26, 2024
79957ea
New translations issue.png (French)
sashamishcheriakova Sep 26, 2024
d814710
New translations issue.png (Japanese)
sashamishcheriakova Sep 26, 2024
1a2991c
New translations issue.png (Dutch)
sashamishcheriakova Sep 26, 2024
347f83d
New translations issues.png (French)
sashamishcheriakova Sep 26, 2024
2e8d743
New translations issues.png (Japanese)
sashamishcheriakova Sep 26, 2024
6209290
New translations issues.png (Dutch)
sashamishcheriakova Sep 26, 2024
b4828e3
New translations login-github.png (French)
sashamishcheriakova Sep 26, 2024
e22bb0c
New translations login-github.png (Japanese)
sashamishcheriakova Sep 26, 2024
c09b41d
New translations login-github.png (Dutch)
sashamishcheriakova Sep 26, 2024
5d23376
New translations new-repo.png (French)
sashamishcheriakova Sep 26, 2024
b14143e
New translations new-repo.png (Japanese)
sashamishcheriakova Sep 26, 2024
22c2ae4
New translations new-repo.png (Dutch)
sashamishcheriakova Sep 26, 2024
cd77be9
New translations new-repo2.png (French)
sashamishcheriakova Sep 26, 2024
51ff86a
New translations new-repo2.png (Japanese)
sashamishcheriakova Sep 26, 2024
97157c1
New translations new-repo2.png (Dutch)
sashamishcheriakova Sep 26, 2024
179313f
New translations pull.png (French)
sashamishcheriakova Sep 26, 2024
f536edf
New translations pull.png (Japanese)
sashamishcheriakova Sep 26, 2024
11674a7
New translations pull.png (Dutch)
sashamishcheriakova Sep 26, 2024
86ca432
New translations pull2.png (French)
sashamishcheriakova Sep 26, 2024
65bb4c8
New translations pull2.png (Japanese)
sashamishcheriakova Sep 26, 2024
b04fbe1
New translations pull2.png (Dutch)
sashamishcheriakova Sep 26, 2024
2818f0f
New translations pull3.png (French)
sashamishcheriakova Sep 26, 2024
7054c8d
New translations pull3.png (Japanese)
sashamishcheriakova Sep 26, 2024
a9d5c19
New translations pull3.png (Dutch)
sashamishcheriakova Sep 26, 2024
35f70cf
New translations pull4.png (French)
sashamishcheriakova Sep 26, 2024
e1eae56
New translations pull4.png (Japanese)
sashamishcheriakova Sep 26, 2024
114b25f
New translations pull4.png (Dutch)
sashamishcheriakova Sep 26, 2024
1884ce5
New translations spotlight.png (French)
sashamishcheriakova Sep 26, 2024
b5d777a
New translations spotlight.png (Japanese)
sashamishcheriakova Sep 26, 2024
b64668f
New translations spotlight.png (Dutch)
sashamishcheriakova Sep 26, 2024
5d7d7e4
New translations terminal.png (French)
sashamishcheriakova Sep 26, 2024
f0b31b7
New translations terminal.png (Japanese)
sashamishcheriakova Sep 26, 2024
372b3db
New translations terminal.png (Dutch)
sashamishcheriakova Sep 26, 2024
8c33fb2
New translations meta.yml (French)
sashamishcheriakova Sep 26, 2024
bef3c0e
New translations meta.yml (Japanese)
sashamishcheriakova Sep 26, 2024
d0b4372
New translations meta.yml (Dutch)
sashamishcheriakova Sep 26, 2024
9de305b
New translations example.py (French)
sashamishcheriakova Sep 26, 2024
eb52c4f
New translations example.py (Japanese)
sashamishcheriakova Sep 26, 2024
a2939d3
New translations example.py (Dutch)
sashamishcheriakova Sep 26, 2024
cd6fcda
New translations step_1.md (French)
sashamishcheriakova Sep 26, 2024
0f9fc3f
New translations step_1.md (Japanese)
sashamishcheriakova Sep 26, 2024
d27c9aa
New translations step_1.md (Dutch)
sashamishcheriakova Sep 26, 2024
378a9c7
New translations step_10.md (French)
sashamishcheriakova Sep 26, 2024
2f387c4
New translations step_10.md (Japanese)
sashamishcheriakova Sep 26, 2024
c005c9e
New translations step_10.md (Dutch)
sashamishcheriakova Sep 26, 2024
829ce86
New translations step_11.md (French)
sashamishcheriakova Sep 26, 2024
809b5cf
New translations step_11.md (Japanese)
sashamishcheriakova Sep 26, 2024
1960462
New translations step_11.md (Dutch)
sashamishcheriakova Sep 26, 2024
32b4c6f
New translations step_12.md (French)
sashamishcheriakova Sep 26, 2024
ad88f18
New translations step_12.md (Japanese)
sashamishcheriakova Sep 26, 2024
2395786
New translations step_12.md (Dutch)
sashamishcheriakova Sep 26, 2024
b1b80df
New translations step_13.md (French)
sashamishcheriakova Sep 26, 2024
972c335
New translations step_13.md (Japanese)
sashamishcheriakova Sep 26, 2024
00ed19b
New translations step_13.md (Dutch)
sashamishcheriakova Sep 26, 2024
652582c
New translations step_14.md (French)
sashamishcheriakova Sep 26, 2024
c66c72b
New translations step_14.md (Japanese)
sashamishcheriakova Sep 26, 2024
0129201
New translations step_14.md (Dutch)
sashamishcheriakova Sep 26, 2024
276236a
New translations step_2.md (French)
sashamishcheriakova Sep 26, 2024
891dc75
New translations step_2.md (Japanese)
sashamishcheriakova Sep 26, 2024
fb9758b
New translations step_2.md (Dutch)
sashamishcheriakova Sep 26, 2024
eec3d21
New translations step_3.md (French)
sashamishcheriakova Sep 26, 2024
3f30344
New translations step_3.md (Japanese)
sashamishcheriakova Sep 26, 2024
101fd74
New translations step_3.md (Dutch)
sashamishcheriakova Sep 26, 2024
ab1a42d
New translations step_4.md (French)
sashamishcheriakova Sep 26, 2024
a24882b
New translations step_4.md (Japanese)
sashamishcheriakova Sep 26, 2024
ec23eb6
New translations step_4.md (Dutch)
sashamishcheriakova Sep 26, 2024
58708c2
New translations step_5.md (French)
sashamishcheriakova Sep 26, 2024
4f40ff6
New translations step_5.md (Japanese)
sashamishcheriakova Sep 26, 2024
a2be2ed
New translations step_5.md (Dutch)
sashamishcheriakova Sep 26, 2024
4ccff4a
New translations step_6.md (French)
sashamishcheriakova Sep 26, 2024
b9f195d
New translations step_6.md (Japanese)
sashamishcheriakova Sep 26, 2024
29cad5e
New translations step_6.md (Dutch)
sashamishcheriakova Sep 26, 2024
9a48e61
New translations step_7.md (French)
sashamishcheriakova Sep 26, 2024
77478a5
New translations step_7.md (Japanese)
sashamishcheriakova Sep 26, 2024
1ceb0b3
New translations step_7.md (Dutch)
sashamishcheriakova Sep 26, 2024
4e38a57
New translations step_8.md (French)
sashamishcheriakova Sep 26, 2024
fbcd098
New translations step_8.md (Japanese)
sashamishcheriakova Sep 26, 2024
da249f9
New translations step_8.md (Dutch)
sashamishcheriakova Sep 26, 2024
2501ba4
New translations step_9.md (French)
sashamishcheriakova Sep 26, 2024
498374d
New translations step_9.md (Japanese)
sashamishcheriakova Sep 26, 2024
96139dc
New translations step_9.md (Dutch)
sashamishcheriakova Sep 26, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file added fr-FR/images/banner.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added fr-FR/images/clone.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added fr-FR/images/closed.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added fr-FR/images/download-git.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added fr-FR/images/fork.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added fr-FR/images/forking.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added fr-FR/images/gh-reg.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added fr-FR/images/gh-repo.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added fr-FR/images/git-icons.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added fr-FR/images/git-logo.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added fr-FR/images/github-shell.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added fr-FR/images/homebrew.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added fr-FR/images/installed-git.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added fr-FR/images/instructions.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added fr-FR/images/issue.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added fr-FR/images/issues.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added fr-FR/images/login-github.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added fr-FR/images/new-repo.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added fr-FR/images/new-repo2.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added fr-FR/images/pull.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added fr-FR/images/pull2.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added fr-FR/images/pull3.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added fr-FR/images/pull4.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added fr-FR/images/spotlight.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added fr-FR/images/terminal.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
51 changes: 51 additions & 0 deletions fr-FR/meta.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,51 @@
---
title: Getting started with Git
hero_image: images/banner.png
description: Learn how to use Git and GitHub from the command line on Linux, Mac OS and Windows
original_url: https://raspberrypi.org/learning/getting-started-with-git
theme: yellow
duration: 2
listed: true
ingredient: false
copyedit: true
curriculum: 2, design-0, programming-0, phys-comp-0, manufacture-0, community-2
interests: ''
technologies: ''
site_areas: projects
hardware: ''
software: ''
version: 3
last_tested: 2017-01-01
steps:
-
title: Introduction
-
title: What you will need
-
title: What is Git?
-
title: Getting Git
completion:
- engaged
-
title: Setting up Git
-
title: Creating your first magic school bag
-
title: Adding your books
-
title: Adding more books and travelling in time
-
title: Making major changes
-
title: Working with a sky-bag
-
title: Collaborative working
-
title: GitHub issues
-
title: Pull requests
completion:
- internal
-
title: What next?
1 change: 1 addition & 0 deletions fr-FR/resources/example.py
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
print("Hello world")
15 changes: 15 additions & 0 deletions fr-FR/step_1.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
## What you will make

In this resource, you will learn how to use the Git version control software to help you to work on your own projects and contribute to open-source projects.

## What you will learn

In this resource you will learn:

- How to manage your projects using Git
- How to use GitHub to store remote versions of your projects
- How to collaborate on open-source software and projects using GitHub

This resource covers elements from the following strands of the [Raspberry Pi Digital Making Curriculum](https://www.raspberrypi.org/curriculum/):

- [Collaborate on digital making projects with other community members](https://www.raspberrypi.org/curriculum/community-and-sharing/builder)
49 changes: 49 additions & 0 deletions fr-FR/step_10.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,49 @@
## Working with a sky-bag

Now that you know how to do the basics in Git, it's time to learn how to use it to its full potential: use it to share your work and collaborate with others.

There are lots of services that will host your Git repo for you, free of charge. [GitLab](https://about.gitlab.com/) is one such service and [BitBucket](https://bitbucket.org/) is another. In this resource, you are going to be using [GitHub](https://github.com/), which is one of the more popular services.

- The first thing to do is to register for an account on [GitHub](https://github.com/join?source=header-home), and just choose the free plan.

![](images/gh-reg.png)

- Now that you have an account, you can create a `snitch-sniffer` repo on GitHub. Find the **New repository** button and click it.

![](images/new-repo.png)

- Give the repo a name and a description and click on the **Create repository** button

![](images/new-repo2.png)

- This should then bring up a page of instructions

![](images/instructions.png)

- As you already have a repo ready to push to GitHub, then all you need to do is make sure you are in your project directory and type:

```bash
git remote add origin [email protected]:HarryPotter/snitch-sniffer.git
```

and then

```bash
git push -u origin master
```

- If you look on GitHub, you should now be able to see your repo, along with the displayed `README.md` file that you wrote.

![](images/gh-repo.png)

- Any time you make changes to your project, and you want to push them up to GitHub, you can just type:

```bash
git push origin master
```

If you are working on a different branch you would type:

```bash
git push origin <branch-name>
```
5 changes: 5 additions & 0 deletions fr-FR/step_11.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
## Collaborative working

The true power of services like GitHub becomes apparent when you start working with other people. GitHub lets other people make their own copies of your projects, or you to make copies of theirs. Either of you can then make improvements to the project and then push the improvements up to GitHub for everyone to share.

This resource is itself a GitHub repo. You can find it at [https://github.com/raspberrypilearning/getting-started-with-git](https://github.com/raspberrypilearning/getting-started-with-git). That means that if you found a mistake in the resource, or if you just wanted to make some improvements, you can. There are two main ways to get involved with other people's projects: **issues** and **pull requests**.
23 changes: 23 additions & 0 deletions fr-FR/step_12.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
## GitHub issues

Our copy editors at Raspberry Pi are pretty amazing, so the chances of you spotting a typo in this resource are pretty slim. You might spot a mistake in some of the code though, and that's where you can help out. Take this bit of code for example:

```python
print("Hello World!)
```

Let's see how you could help fix this error.

- Head on over to [https://github.com/raspberrypilearning/getting-started-with-git](https://github.com/raspberrypilearning/getting-started-with-git), and make sure you are logged in.

- Now, you want to find the **Issues** tab

![](images/issues.png)

- You can now create a new issue, and give a description

![](images/issue.png)

- Once that's completed, the maintainers of the repo will be able to reply to you, and close the issue once it's fixed.

![](images/closed.png)
31 changes: 31 additions & 0 deletions fr-FR/step_13.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
## Pull requests

Issues are great, but if you want to help out even more, then project maintainers are usually very happy for you to fix or improve projects yourself. To do this, you need to make your own copy of the repo so that you can work on it.

- On the projects main page, find the **Fork** button, and click it.

![](images/fork.png)

- You will now have a copy of the repo. You should see a **Clone or download** button. Clicking this will reveal the uniform resource identifier (URI) of the repo. Now, using the terminal, you can clone the repo to your computer with `git clone`:

```bash
git clone https://github.com/HelpfulUser/getting-started-with-git.git
```

- All the files and directories will now be on your computer. Go ahead and make the changes you want, then commit them and push them back up to GitHub, just like you would normally do. Here your commit message is particularly important, as it will explain the changes you have made to the resource's original owner.

- You can now head back over to GitHub. Find the button that says **New pull request**.

![](images/pull.png)

- Click the button and then click on the **Create pull request** button.

![](images/pull2.png)

- Your commit message will be there, but you can change it and even add a more detailed description if you like.

![](images/pull3.png)

- Once you're happy, click the **Create pull request** button. The maintainer of the repo will then be able to see your pull request. They can then choose to merge it into their repo, or close it.

![](images/pull4.png)
7 changes: 7 additions & 0 deletions fr-FR/step_14.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
## What next?

- Now that you have an understanding of the way Git and GitHub works, you could start using it for all your projects.

- When you create a project, don't forget to tell people about it, and send them links to your GitHub repos. That way they can use your code and maybe even help to make it better.

- Why not find a project that you could help out with on GitHub? You can help with anything from improving the code and the documentation to fixing little typos.
3 changes: 3 additions & 0 deletions fr-FR/step_2.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
## What you will need

- An internet connected computer
13 changes: 13 additions & 0 deletions fr-FR/step_3.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
## What is Git?

![logo](images/git-logo.png)

Git is a version control system (VCS) for tracking changes to files and coordinating changes between multiple people who are all working on the same code base.

One way to think about Git is to imagine a magical school bag. You can pull books out of your bag and do some work whenever you like. Once you've finished your homework, you can put the books back into your school bag, and the bag remembers what changes you made to all the books inside it.

What's really clever is that this school bag can be synchronised with another magical school bag that lives in the clouds. Whenever you like, you can tell the bag to copy the contents of all the books to the sky-bag. If you lose your own school bag, you don't have to worry, as you can just get a new one and grab all the books and writing from the sky-bag.

That's not all though. All your friends at school also have magical school bags. They also keep their bags synchronised with the sky-bag. This means that you and your friends can all work on the homework together. If a friend has a better answer to a science question than you do, you can copy their answer from the sky-bag to your book.

It gets even better than that: your teacher also has a magical school bag. When she wants to check the homework, she just copies all the books from the sky-bag to her bag. She can then check through the answers from the whole class in one go. If she spots a mistake, she can write a comment in the margin of the book, and then all the magical bags from the whole class will receive the comment. Only one person in the class needs to correct the mistake though, and then everyone in the class immediately has the correct answer.
70 changes: 70 additions & 0 deletions fr-FR/step_4.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,70 @@
## Getting Git

If you're working on a Raspberry Pi, then congratulations: Git already is installed in Raspbian by default. If you're using Mac OS, then you can follow the collapsed section below to instal Git and then return here to learn how to use it.

## --- collapse ---

## title: Installing Git on Mac OS

Getting Git set up on Mac OS is easy, and has the added benefit of giving you a package manager to install lots of other awesome and open-source software.

1. You're going to need to start by typing a command into a terminal window on Mac OS. This will install the [Homebrew package manager](https://brew.sh/), which is pretty similar to **apt** on Linux.

![homebrew](images/homebrew.png)

2. Open up a terminal window by typing `Cmd + Space` to open Spotlight and then type `terminal` into the search field.

![spotlight](images/spotlight.png)

3. Now copy and past the following command into the terminal window to install Homebrew.

```bash
/usr/bin/ruby -e "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/master/install)"
```

![terminal](images/terminal.png)

4. You can hit **Return** at the prompts and allow Homebrew to install. Once it is finished, you'll have Git installed on Mac OS, as it's an integral part of Homebrew. You can return to the [main worksheet](worksheet.md), and carry on following the guide.

![installed](images/installed-git.png)

5. As an added bonus, you now have an amazing package manager which you can use to install software. For instance, you can install Emacs just by typing `brew install emacs` into a terminal window.
\--- /collapse ---

If you're on Windows, then you can follow the collapsed section below to install the Git shell.

## --- collapse ---

## title: Installing Git on Windows

The easiest way to install Git on Windows is to use GitHub's application. If you do not already have a GitHub account, you should begin by setting one up, as this will make things easier later on.

1. Register for an account on [GitHub](https://github.com/join?source=header-home), and choose the free plan.

![](images/gh-reg.png)

2. Head over to [desktop.github.com](https://desktop.github.com/) and click on the **Download** button to download the GitHub app.

![github](images/download-git.png)

3. Once the file has downloaded, double click on the `.exe` file and follow the onscreen instructions to install. Near the end of the registration, you'll need to use your GitHub credentials to log in, and then proceed through the rest of the steps.

![authenticate](images/login-github.png)

4. Once the setup has completed, you should see two new icons on your desktop and in your Application menu.

![icons](images/git-icons.png)

5. You can use the graphical version of the GitHub app, but if you want to follow the rest of the [worksheet](worksheet.md), you should use the **Git shell** app, which is a command line interface (CLI), to use Git. This way, you'll feel comfortable working on other operating systems, and you will also learn a little Bash (Bourne-again shell).

![github-shell](images/github-shell.png)

6. As the GitHub app has configured your username and email address, you can skip the **Setting up Git** section of the main worksheet.

\--- /collapse ---

Lastly, if you're on Linux, and you don't have Git installed, then you can just use your package manager to grab the software. Something like this should work:

```bash
sudo apt install git
```
16 changes: 16 additions & 0 deletions fr-FR/step_5.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
## Setting up Git

You're going to be working in a terminal window for the duration of this resource, so open it up by clicking on the icon on the desktop, or by pressing `Ctrl + Alt + T` on your keyboard.

- The first thing to do is to tell Git who you are. This is important, as Git can be used collaboratively by lots of people, so it needs to know who made changes to which files. You can use your own username and email address, unless you are in fact the Boy Who Lived.

```bash
git config --global user.name "Harry Potter"
git config --global user.email "[email protected]"
```

- Next you need to tell Git which text editor you want to use. If you don't have any particularly strong feelings about text editors, then you can just type:

```bash
git config --global core.editor nano
```
66 changes: 66 additions & 0 deletions fr-FR/step_6.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,66 @@
## Creating your first magic school bag

So you want to start a new project? Maybe it's a special ultrasonic range finder for tracking flying objects in the air. You'll want a directory on your computer for all your files to sit in, so the first thing to do is create that directory.

- In the terminal, you can use the `mkdir` (make directory) command to create a new directory.

```bash
mkdir snitch-sniffer
```

- Now you want to go into that directory. You can use the `cd` (change directory) command to do this.

```bash
cd snitch-sniffer
```

- Next, you can create a file that will tell people what the project is about. You can use any text editor to do this, such as Notepad, TextEdit or Gedit. Create a file called `README.md`. The `.md` extension stands for **Markdown**, which is a markup language. You can learn more about Markdown [here](https://daringfireball.net/projects/markdown/).

- You can now give the file a title and write a short explanation of what your project is about.

```markdown
# The Golden Snitch Sniffer
This is a project that uses multiple long-range ultrasonic sensors to find and track
an object flying in three-dimensional space. It displays the object's coordinates,
speed, and trajectory through a VR headset.
```

- Pressing `Ctrl + X` will cause a save prompt to appear. You can type `Y` to save and then hit `Enter` to close nano.

- Your file should have been created and will now be sitting in your directory. You can type `ls` in the terminal or `dir` if you are using Windows, to see a list of files.

```bash
ls
```

- At the moment, the directory is just like any other directory on your system. You now need to make the magical school bag part. This is known as a **Git repository**, and it takes the form of a hidden directory that keeps track of all the changes to the working directory. Type the following to create the repository, which from now on will just be called a **repo**:

```bash
git init
```

- If you type `ls` again, nothing will appear to have changed. You can use `ls -a` to see all the hidden files and directories, though. If you are using Windows then type `dir /A` instead.

```
ls -a
```

- You should now see something like this in your terminal window:

```bash
. .. .git README.md
```

- That `.git` directory is the **repo skeleton**. You can have a look inside it by typing the following. (Remember if you are using Windows it would be `dir /A .git`.)

```bash
ls -a .git
```

- This should bring up something like:

```bash
branches config description HEAD hooks info objects refs
```

- You don't really need to worry about this directory at all now. Just know that it is there and that it is tracking all the changes to the parent directory `snitch-sniffer`.
Loading