Simplify conso

_partials/cn/macos_homebrew.md

@@ -12,32 +12,24 @@
 
 :warning: 当你输入你的密码的时候，屏幕上不会有任何的显示，**这是正常的**。这是一个安全保护的设置，来隐藏你整个密码，包括它的长度。你可以放心的输入你的密码，结束后按下`Enter`就可以了。
 
-:warning: 如果你看到了下面的警告:point_down:，运行`Next steps`下面的两个命令把Homebrew加到你的PATH里。
+如果你已经有了Homebrew,终端会告诉你的。那么一切正常，你可以继续接下来的步骤。
+
+Homebrew安装完成后，运行以下两个命令，将其添加到你的`PATH`中：
 
-![macOS Homebrew installation warning](images/macos_homebrew_warning.png)
 
 ```bash
-# ⚠️ Only execute these commands if you saw this warning ☝
 echo 'eval "$(/opt/homebrew/bin/brew shellenv)"' >> ~/.zprofile
 eval "$(/opt/homebrew/bin/brew shellenv)"
 ```
 
-如果你已经有了Homebrew,终端会告诉你的。那么一切正常，你可以继续接下来的步骤。
-
-接下来，让我们安装一些有用的软件：
-
-```bash
-brew update
-```
 
-如果你得到了`/usr/local must be writable`的报错，直接运行以下指令：
+确保你使用的是最新版本：
 
 ```bash
-sudo chown -R $USER:admin /usr/local
 brew update
 ```
 
-无论是否有这行报错，继续执行下方的指令（你可以一次性直接复制/粘贴下方所有行）
+然后安装一些有用的软件（你可以一次性复制/粘贴下面的所有命令）：
 
 ```bash
 brew upgrade git         || brew install git
@@ -46,4 +38,5 @@ brew upgrade wget        || brew install wget
 brew upgrade imagemagick || brew install imagemagick
 brew upgrade jq          || brew install jq
 brew upgrade openssl     || brew install openssl
+brew upgrade tree        || brew install tree
 ```

_partials/es/macos_homebrew.md

@@ -12,38 +12,29 @@ Te pedirá que confirmes (presionando `Enter`) y también te pedirá la **contra
 
 :warning: Cuando escribas tu contraseña no verás nada en la pantalla. **Esto es normal**. Es una herramienta de seguridad para ocultar tanto el contenido de tu contraseña como su longitud. Simplemente escribe tu contraseña y presiona `Enter` al terminar.
 
-:warning: Si ves esta advertencia :point_down:, ejecuta los dos comandos de la sección `Next steps` para añadir Homebrew a tu PATH:
+Si ya tienes Homebrew instalado, el sistema te lo dirá y puedes continuar.
 
-![macOS Homebrew installation warning](images/macos_homebrew_warning.png)
+Una vez que Homebrew haya terminado de instalarse, ejecuta estos dos comandos para agregarlo a tu `PATH`:
 
 ```bash
-# ⚠️ Only execute these commands if you saw this warning ☝
 echo 'eval "$(/opt/homebrew/bin/brew shellenv)"' >> ~/.zprofile
 eval "$(/opt/homebrew/bin/brew shellenv)"
 ```
 
-Si ya tienes Homebrew instalado, el sistema te lo dirá y puedes continuar.
-
-Luego instala algunos programas útiles:
-
-```bash
-brew update
-```
-
-Si obtienes un error como este: `/usr/local must be writable`, ejecuta el código que te mostramos a continuación:
+Asegúrate de tener la última versión:
 
 ```bash
-sudo chown -R $USER:admin /usr/local
 brew update
 ```
 
-Ejecuta el siguiente código en tu terminal (puedes copiar y pegar todas las líneas de código al mismo tiempo):
+Luego, instala algunos programas útiles (puedes copiar y pegar todas las líneas de código al mismo tiempo):
 
 ```bash
-brew upgrade git || brew install git
-brew upgrade gh || brew install gh
-brew upgrade wget || brew install wget
+brew upgrade git         || brew install git
+brew upgrade gh          || brew install gh
+brew upgrade wget        || brew install wget
 brew upgrade imagemagick || brew install imagemagick
-brew upgrade jq || brew install jq
-brew upgrade openssl || brew install openssl
+brew upgrade jq          || brew install jq
+brew upgrade openssl     || brew install openssl
+brew upgrade tree        || brew install tree
 ```

_partials/fr/macos_homebrew.md

@@ -12,32 +12,22 @@ On te demandera de confirmer (appuie sur `Enter`) et de saisir ton **mot de pass
 
 :warning: Lorsque tu saisiras ton mot de passe, rien ne s’affichera à l’écran ; **c’est normal**. Il s’agit d’une mesure de sécurité permettant de masquer ton mot de passe et sa longueur. Saisis simplement ton mot de passe, puis appuie sur `Enter`.
 
-:warning: Si tu vois cet avertissement :point_down:, exécute les deux commandes de la section `Next steps` pour ajouter Homebrew à ton PATH
+Si tu as déjà Homebrew, le système te l’indiquera. Continue.
 
-![macOS Homebrew installation warning](images/macos_homebrew_warning.png)
+Une fois l’installation de Homebrew terminée, exécute les deux commandes suivantes pour l’ajouter à ton `PATH` :
 
 ```bash
-# ⚠️ Only execute these commands if you saw this warning ☝
 echo 'eval "$(/opt/homebrew/bin/brew shellenv)"' >> ~/.zprofile
 eval "$(/opt/homebrew/bin/brew shellenv)"
 ```
 
-Si tu as déjà Homebrew, le système te l’indiquera. Continue.
-
-Installe ensuite quelques logiciels utiles :
-
-```bash
-brew update
-```
-
-Si tu vois apparaître une erreur `/usr/local must be writable`, exécute simplement :
+Assure-toi d’avoir la dernière version :
 
 ```bash
-sudo chown -R $USER:admin /usr/local
 brew update
 ```
 
-Exécute les commandes suivantes dans le terminal (tu peux copier-coller toutes les lignes en une seule fois):
+Installe ensuite quelques logiciels utiles (tu peux copier / coller toutes les lignes en une seule fois) :
 
 ```bash
 brew upgrade git         || brew install git
@@ -46,4 +36,5 @@ brew upgrade wget        || brew install wget
 brew upgrade imagemagick || brew install imagemagick
 brew upgrade jq          || brew install jq
 brew upgrade openssl     || brew install openssl
+brew upgrade tree        || brew install tree
 ```

_partials/macos_command_line_tools.md

@@ -8,7 +8,11 @@ During this setup you will be asked to **quit and re-open** applications multipl
 
 ## Command Line Tools
 
-Open a new terminal, copy-paste the following command and hit `Enter`:
+Open a new terminal window from Launchpad > Other, or from Finder > Applications > Utilities, or search for it with [Spotlight](https://support.apple.com/en-gb/HT204014):
+
+![Open Terminal on macOS](images/macos_open_terminal.png)
+
+Copy-paste the following command and hit `Enter`:
 
 ```bash
 xcode-select --install

_partials/macos_homebrew.md

@@ -12,41 +12,29 @@ This will ask for your confirmation (hit `Enter`) and your **macOS user account
 
 :warning: When you type your password, nothing will show up on the screen, **that's normal**. This is a security feature to mask not only your password as a whole but also its length. Just type your password and when you're done, press `Enter`.
 
-:warning: If you see this warning :point_down:, run the two commands in the `Next steps` section to add Homebrew to your PATH:
+If you already have Homebrew, it will tell you so, that's fine, go on.
 
-![macOS Homebrew installation warning](images/macos_homebrew_warning.png)
+Once Homebrew has finished installing, run these two commands to add it to your `PATH`:
 
 ```bash
-# ⚠️ Only execute these commands if you saw this warning ☝
 echo 'eval "$(/opt/homebrew/bin/brew shellenv)"' >> ~/.zprofile
 eval "$(/opt/homebrew/bin/brew shellenv)"
 ```
 
-If you already have Homebrew, it will tell you so, that's fine, go on.
-
-Then install some useful software:
-
-```bash
-brew update
-```
-
-If you get a `/usr/local must be writable` error, just run this:
-
-```bash
-sudo chown -R $USER:admin /usr/local
-```
+Make sure you're on the latest version:
 
 ```bash
 brew update
 ```
 
-Proceed running the following in the terminal (you can copy / paste all the lines at once):
+Then install some useful software (you can copy / paste all the lines at once):
 
 ```bash
-brew upgrade git         || brew install git
-brew upgrade gh          || brew install gh
-brew upgrade wget        || brew install wget
-brew upgrade imagemagick || brew install imagemagick
-brew upgrade jq          || brew install jq
-brew upgrade openssl     || brew install openssl
+brew upgrade git         || brew install -y git
+brew upgrade gh          || brew install -y gh
+brew upgrade wget        || brew install -y wget
+brew upgrade imagemagick || brew install -y imagemagick
+brew upgrade jq          || brew install -y jq
+brew upgrade openssl     || brew install -y openssl
+brew upgrade tree        || brew install -y tree
 ```

_partials/pt/macos_homebrew.md

@@ -12,35 +12,22 @@ Isso solicitará sua confirmação (pressione `Enter`) e sua **senha da conta de
 
 :warning: Quando você digita sua senha, nada aparecerá na tela, **isso é normal**. Este é um recurso de segurança para mascarar não apenas sua senha como um todo, mas também seu comprimento. Basta digitar sua senha e quando terminar, pressione `Enter`.
 
-:warning: Se você vir este aviso :point_down:, execute os dois comandos na seção `Próximas etapas` para adicionar o Homebrew ao seu PATH:
+Se você já tem o Homebrew, ele lhe dirá, tudo bem, vá em frente.
 
-![Aviso de instalação do macOS Homebrew](images/macos_homebrew_warning.png)
+Quando a instalação do Homebrew terminar, execute estes dois comandos para adicioná-lo ao seu `PATH`:
 
 ```bash
-# ⚠️ Execute esses comandos apenas se você viu este aviso ☝
 echo 'eval "$(/opt/homebrew/bin/brew shellenv)"' >> ~/.zprofile
 eval "$(/opt/homebrew/bin/brew shellenv)"
 ```
 
-Se você já tem o Homebrew, ele lhe dirá, tudo bem, vá em frente.
-
-Em seguida, instale algum software útil:
-
-```bash
-brew update
-```
-
-Se você receber um erro `/usr/local deve ser gravável`, basta executar isto:
-
-```bash
-sudo chown -R $USER:admin /usr/local
-```
+Certifique-se de que está usando a versão mais recente:
 
 ```bash
 brew update
 ```
 
-Continue executando o seguinte no terminal (você pode copiar/colar todas as linhas de uma vez):
+Em seguida, instale alguns softwares úteis (você pode copiar/colar todas as linhas de uma vez):
 
 ```bash
 brew upgrade git         || brew install git
@@ -49,4 +36,5 @@ brew upgrade wget        || brew install wget
 brew upgrade imagemagick || brew install imagemagick
 brew upgrade jq          || brew install jq
 brew upgrade openssl     || brew install openssl
+brew upgrade tree        || brew install tree
 ```

_partials/windows_ubuntu.md

@@ -49,57 +49,6 @@ At first launch, you will be asked some information:
 
 :warning: When you type your password, nothing will show up on the screen, **that's normal**. This is a security feature to mask not only your password as a whole but also its length. Just type your password and when you're done, press `Enter`.
 
-
-### Check the WSL version of Ubuntu
-
-- Press `Windows` + `R`
-- Type  `cmd`
-- Press `Enter`
-
-Type the following command:
-
-```bash
-wsl -l -v
-```
-
-:heavy_check_mark: If the version of Ubuntu WSL is 2, you are good to go :+1:
-
-:x: If the version of Ubuntu WSL is 1, we will need to convert it to version 2.
-
-<details>
-  <summary>Convert Ubuntu WSL V1 to V2</summary>
-
-  In the Command Prompt window, type:
-
-  ```bash
-  wsl --set-version Ubuntu 2
-  ```
-
-  :heavy_check_mark: After a few seconds, you should get the following message: `The conversion is complete`.
-
-  :x: If it does not work, we need to be sure that Ubuntu files are not compressed.
-
-<details>
-  <summary>Check for Uncompressed Files</summary>
-
-  - Press `Windows` + `R`
-  - Type  `%localappdata%\Packages`
-  - Press `Enter`
-  - Open the folder named `CanonicalGroupLimited.UbuntuonWindows...`
-  - Right Click on the `LocalState` folder
-  - Click on `Properties`
-  - Click on `Advanced`
-  - Make sure that the option `Compress content` is **not** ticked, then click on `Ok`.
-
-  Apply changes to this folder only and try to convert the Ubuntu WSL version again.
-
-  :x: If the conversion still does not work, please **contact a teacher**.
-</details>
-
-You can close this terminal now.
-
-</details>
-
 ### Check your username
 
 Type this in the Ubuntu terminal:

macos.cn.md

@@ -71,32 +71,24 @@ sudo softwareupdate --clear-catalog
 
 :warning: 当你输入你的密码的时候，屏幕上不会有任何的显示，**这是正常的**。这是一个安全保护的设置，来隐藏你整个密码，包括它的长度。你可以放心的输入你的密码，结束后按下`Enter`就可以了。
 
-:warning: 如果你看到了下面的警告:point_down:，运行`Next steps`下面的两个命令把Homebrew加到你的PATH里。
+如果你已经有了Homebrew,终端会告诉你的。那么一切正常，你可以继续接下来的步骤。
+
+Homebrew安装完成后，运行以下两个命令，将其添加到你的`PATH`中：
 
-![macOS Homebrew installation warning](images/macos_homebrew_warning.png)
 
 ```bash
-# ⚠️ Only execute these commands if you saw this warning ☝
 echo 'eval "$(/opt/homebrew/bin/brew shellenv)"' >> ~/.zprofile
 eval "$(/opt/homebrew/bin/brew shellenv)"
 ```
 
-如果你已经有了Homebrew,终端会告诉你的。那么一切正常，你可以继续接下来的步骤。
-
-接下来，让我们安装一些有用的软件：
-
-```bash
-brew update
-```
 
-如果你得到了`/usr/local must be writable`的报错，直接运行以下指令：
+确保你使用的是最新版本：
 
 ```bash
-sudo chown -R $USER:admin /usr/local
 brew update
 ```
 
-无论是否有这行报错，继续执行下方的指令（你可以一次性直接复制/粘贴下方所有行）
+然后安装一些有用的软件（你可以一次性复制/粘贴下面的所有命令）：
 
 ```bash
 brew upgrade git         || brew install git
@@ -105,6 +97,7 @@ brew upgrade wget        || brew install wget
 brew upgrade imagemagick || brew install imagemagick
 brew upgrade jq          || brew install jq
 brew upgrade openssl     || brew install openssl
+brew upgrade tree        || brew install tree
 ```