Merge pull request DjangoGirls#1593 from pqzx/issue-1592

das-g · web-flow · commit 22e5a6abd392 · 2019-10-14T11:45:28.000+02:00
Move note about activating virtual env into relevant section
diff --git a/de/django_installation/instructions.md b/de/django_installation/instructions.md
@@ -121,6 +121,13 @@ Starte deine virtuelle Umgebung, indem du Folgendes eingibst:
 >         The execution policy helps protect you from scripts that you do not trust. Changing the execution policy might expose you to the security risks described in the about_Execution_Policies help topic at http://go.microsoft.com/fwlink/?LinkID=135170. Do you want to change the execution policy? [Y] Yes  [A] Yes to All  [N] No  [L] No to All  [S] Suspend  [?] Help (default is "N"): A
 >     
 
+> **Hinweis:** Für Benutzerinnen des populären Editors VS Code, der einen Powershell-basiertes Terminal eingebaut hat: Wenn du beim eingebauten Terminal bleiben willst, kannst du deine virtuelle Umgebung mit folgendem Befehl aktivieren:
+> 
+>     $ . myvenv\Scripts\activate.ps1
+>     
+> 
+> Der Vorteil davon ist, dass du nicht zwischen den Editor-Fenstern und den Kommandozeilen-Fenstern wechseln musst
+
 <!--endsec-->
 
 <!--sec data-title="Working with virtualenv: Linux and OS X" data-id="virtualenv_linuxosx"
@@ -144,13 +151,6 @@ Der Name `myvenv` muss mit dem von Dir gewählten Namen des `virtualenv` überei
 
 <!--endsec-->
 
-> **Hinweis:** Für Benutzerinnen des populären Editors VS Code, der einen Powershell-basiertes Terminal eingebaut hat: Wenn du beim eingebauten Terminal bleiben willst, kannst du deine virtuelle Umgebung mit folgendem Befehl aktivieren:
-> 
->     $ . myvenv\Scripts\activate.ps1
->     
-> 
-> Der Vorteil davon ist, dass du nicht zwischen den Editor-Fenstern und den Kommandozeilen-Fenstern wechseln musst
-
 Du erkennst, dass dein `virtualenv` gestartet ist, wenn du vor der Eingabeaufforderung eine Klammer mit dem Namen deiner Umgebung siehst, `(myvenv)`.
 
 In deiner neuen virtuellen Umgebung wird automatisch die richtige Version von `python` verwendet. Du kannst also `python` statt `python3` eingeben.
diff --git a/en/django_installation/instructions.md b/en/django_installation/instructions.md
@@ -127,6 +127,13 @@ C:\Users\Name\djangogirls> myvenv\Scripts\activate
 >     The execution policy helps protect you from scripts that you do not trust. Changing the execution policy might expose you to the security risks described in the about_Execution_Policies help topic at http://go.microsoft.com/fwlink/?LinkID=135170. Do you want to change the execution policy? [Y] Yes  [A] Yes to All  [N] No  [L] No to All  [S] Suspend  [?] Help (default is "N"): A
 >```
 
+> __NOTE:__ For users of the popular editor VS Code, which come with an integrated terminal based off windows powershell, if you wish to stick with the integrated terminal, you may run the following command to activate your virtual environment:
+>
+>```
+>$ . myvenv\Scripts\activate.ps1
+>```
+>The advantage is that you don't have to switch between editor windows and command-line windows
+
 <!--endsec-->
 
 <!--sec data-title="Working with virtualenv: Linux and OS X" data-id="virtualenv_linuxosx"
@@ -150,13 +157,6 @@ Remember to replace `myvenv` with your chosen `virtualenv` name!
 
 <!--endsec-->
 
-> __NOTE:__ For users of the popular editor VS Code, which come with an integrated terminal based off windows powershell, if you wish to stick with the integrated terminal, you may run the following command to activate your virtual environment:
->
->```
->$ . myvenv\Scripts\activate.ps1
->```
->The advantage is that you don't have to switch between editor windows and command-line windows
-
 You will know that you have `virtualenv` started when you see that the prompt in your console is prefixed with `(myvenv)`.
 
 When working within a virtual environment, `python` will automatically refer to the correct version so you can use `python` instead of `python3`.
diff --git a/es/django_installation/instructions.md b/es/django_installation/instructions.md
@@ -121,6 +121,13 @@ Inicia el entorno virtual ejecutando:
 >        The execution policy helps protect you from scripts that you do not trust. Changing the execution policy might expose you to the security risks described in the about_Execution_Policies help topic at http://go.microsoft.com/fwlink/?LinkID=135170. Do you want to change the execution policy? [Y] Yes  [A] Yes to All  [N] No  [L] No to All  [S] Suspend  [?] Help (default is "N"): A
 >     
 
+> **NOTA:** Para usuarios del popular editor VS Code, el cual viene con una terminal integrada basada en el poweshell de windows; si deseas añadir la terminal integrada, puedes arrancar el siguiente comando para activar tu entorno virtual:
+> 
+>     $ . myvenv\Scripts\activate.ps1
+>     
+> 
+> La ventaja es que no tienes que cambiar las ventanas entre el editor de código y la línea de comandos.
+
 <!--endsec-->
 
 <!--sec data-title="Working with virtualenv: Linux and OS X" data-id="virtualenv_linuxosx"
@@ -144,13 +151,6 @@ Inicia el entorno virtual ejecutando:
 
 <!--endsec-->
 
-> **NOTA:** Para usuarios del popular editor VS Code, el cual viene con una terminal integrada basada en el poweshell de windows; si deseas añadir la terminal integrada, puedes arrancar el siguiente comando para activar tu entorno virtual:
-> 
->     $ . myvenv\Scripts\activate.ps1
->     
-> 
-> La ventaja es que no tienes que cambiar las ventanas entre el editor de código y la línea de comandos.
-
 Sabrás que tienes `virtualenv` iniciado cuando veas que la línea de comando en tu consola tiene el prefijo `(myvenv)`.
 
 Cuando trabajes en un entorno virtual, `python` automáticamente se referirá a la versión correcta, de modo que puedes utilizar `python` en vez de `python3`.
diff --git a/fa/django_installation/instructions.md b/fa/django_installation/instructions.md
@@ -121,6 +121,13 @@ data-collapse=true ces-->
 >         The execution policy helps protect you from scripts that you do not trust. Changing the execution policy might expose you to the security risks described in the about_Execution_Policies help topic at http://go.microsoft.com/fwlink/?LinkID=135170. Do you want to change the execution policy? [Y] Yes  [A] Yes to All  [N] No  [L] No to All  [S] Suspend  [?] Help (default is "N"): A
 >     
 
+> **نکته:** برای کاربران ویرایشگر VS Code که درون خود یک ترمینال خط فرمان منطبق بر powershell ویندوز دارد، اگر بخواهید از این ترمینال استفاده کنید باید این دستور را برای فعال کردن محیط مجازی خود بزنید:
+> 
+>     $ . myvenv\Scripts\activate.ps1
+>     
+> 
+> فایده این کار این است که لازم نیست دائم بین پنجره ویرایشگر و پنجره خط فرمان جابجا شوید
+
 <!--endsec-->
 
 <!--sec data-title="Working with virtualenv: Linux and OS X" data-id="virtualenv_linuxosx"
@@ -144,13 +151,6 @@ data-collapse=true ces-->
 
 <!--endsec-->
 
-> **نکته:** برای کاربران ویرایشگر VS Code که درون خود یک ترمینال خط فرمان منطبق بر powershell ویندوز دارد، اگر بخواهید از این ترمینال استفاده کنید باید این دستور را برای فعال کردن محیط مجازی خود بزنید:
-> 
->     $ . myvenv\Scripts\activate.ps1
->     
-> 
-> فایده این کار این است که لازم نیست دائم بین پنجره ویرایشگر و پنجره خط فرمان جابجا شوید
-
 هنگامی که پیشوند `(myvenv)` در کنسول خط فرمان اضافه شود به معنی آن است که `محیط مجازی` شما فعال شده است.
 
 وقتی درون یک محیط مجازی کار می‌کنید کلمه `python` به صورت اتوماتیک به نسخه صحیح پایتون ارجاع می‌دهد در نتیجه می‌توانید به جای `python3` از `python` استفاده کنید.
diff --git a/fr/django_installation/instructions.md b/fr/django_installation/instructions.md
@@ -119,7 +119,14 @@ Démarrez votre environnement virtuel en exécutant :
 >     C:\WINDOWS\system32> Set-ExecutionPolicy -ExecutionPolicy RemoteSigned
 >         Execution Policy Change
 >         The execution policy helps protect you from scripts that you do not trust. Changing the execution policy might expose you to the security risks described in the about_Execution_Policies help topic at http://go.microsoft.com/fwlink/?LinkID=135170. Do you want to change the execution policy? [Y] Yes  [A] Yes to All  [N] No  [L] No to All  [S] Suspend  [?] Help (default is "N"): A
+>    
+
+> **NOTE :** Pour les éditeurs du très populaire VS Code, qui comporte un terminal intégré basé sur Windows Powershell, si vous souhaitez conserver le terminal intégré, vous pouvez utiliser la commande suivante pour activer votre environnement virtuel :
+> 
+>     $ . myvenv\Scripts\activate.ps1
 >     
+> 
+> L'avantage, c'est que vous n'aurez pas à constamment passer de l'éditeur aux lignes de commandes
 
 <!--endsec-->
 
@@ -144,13 +151,6 @@ N'oubliez pas de remplacer `myvenv` par le nom que vous avez choisi pour votre `
 
 <!--endsec-->
 
-> **NOTE :** Pour les éditeurs du très populaire VS Code, qui comporte un terminal intégré basé sur Windows Powershell, si vous souhaitez conserver le terminal intégré, vous pouvez utiliser la commande suivante pour activer votre environnement virtuel :
-> 
->     $ . myvenv\Scripts\activate.ps1
->     
-> 
-> L'avantage, c'est que vous n'aurez pas à constamment passer de l'éditeur aux lignes de commandes
-
 Vous saurez que votre `virtualenv` est lancé quand le prompt de votre console est précédé de `(myvenv)`.
 
 Quand vous travaillez dans un environnement virtuel, la commande `python` fera automatiquement référence à la bonne version de Python. Vous pouvez donc utiliser `python` plutôt que `python3`.
diff --git a/ja/django_installation/instructions.md b/ja/django_installation/instructions.md
@@ -122,6 +122,13 @@ data-collapse=true ces-->
 >         The execution policy helps protect you from scripts that you do not trust. Changing the execution policy might expose you to the security risks described in the about_Execution_Policies help topic at http://go.microsoft.com/fwlink/?LinkID=135170. Do you want to change the execution policy? [Y] Yes  [A] Yes to All  [N] No  [L] No to All  [S] Suspend  [?] Help (default is "N"): A
 >     
 
+> **補足:** Windows Powershellベースの結合ターミナルがある人気なエディター「VS Code」を使っている方で、VS Codeの結合ターミナルを使いたい場合、仮想環境をアクティベートにするために下記のコマンドを実行してください:
+> 
+>     $ . myvenv\Scripts\activate.ps1
+>     
+> 
+> エディターとコマンドラインのウィンドウを行き来する必要がなくなるのが利点です。
+
 <!--endsec-->
 
 <!--sec data-title="Working with virtualenv: Linux and OS X" data-id="virtualenv_linuxosx"
@@ -145,13 +152,6 @@ data-collapse=true ces-->
 
 <!--endsec-->
 
-> **補足:** Windows Powershellベースの結合ターミナルがある人気なエディター「VS Code」を使っている方で、VS Codeの結合ターミナルを使いたい場合、仮想環境をアクティベートにするために下記のコマンドを実行してください:
-> 
->     $ . myvenv\Scripts\activate.ps1
->     
-> 
-> エディターとコマンドラインのウィンドウを行き来する必要がなくなるのが利点です。
-
 `virtualenv` が起動すると、プロンプトの行頭に`(myvenv)`が現れます。
 
 Virtual environment(仮想環境) の中で作業しているとき、`python`は自動的に正しいバージョンの`Python`を参照しますので、`python3`の代わりに`python`を使うことができます.
diff --git a/pt/django_installation/instructions.md b/pt/django_installation/instructions.md
@@ -119,7 +119,14 @@ Inicie o seu ambiente virtual executando:
 >     C:\WINDOWS\system32> Set-ExecutionPolicy -ExecutionPolicy RemoteSigned
 >         Execution Policy Change
 >         The execution policy helps protect you from scripts that you do not trust. Changing the execution policy might expose you to the security risks described in the about_Execution_Policies help topic at http://go.microsoft.com/fwlink/?LinkID=135170. Do you want to change the execution policy? [Y] Yes  [A] Yes to All  [N] No  [L] No to All  [S] Suspend  [?] Help (default is "N"): A
+>    
+
+> **NOTA:** Para usuários do editor popular Código VS, que vem com um terminal baseado em janelas, se você deseja manter-se com o terminal integrado, você pode executar o seguinte comando para ativar seu ambiente virtual:
+> 
+>     $ . myvenv\Scripts\activate.ps1
 >     
+> 
+> A vantagem é que você não precisa alternar entre janelas do editor e janelas de linha de comando
 
 <!--endsec-->
 
@@ -144,13 +151,6 @@ Lembre-se de substituir `myvenv` pelo nome que você escolheu para o `virtualenv
 
 <!--endsec-->
 
-> **NOTA:** Para usuários do editor popular Código VS, que vem com um terminal baseado em janelas, se você deseja manter-se com o terminal integrado, você pode executar o seguinte comando para ativar seu ambiente virtual:
-> 
->     $ . myvenv\Scripts\activate.ps1
->     
-> 
-> A vantagem é que você não precisa alternar entre janelas do editor e janelas de linha de comando
-
 Você vai saber que tem um `virtualenv` funcionando quando vir que a linha de comando no seu console tem o prefixo `(myvenv)`.
 
 Ao trabalhar em de um ambiente virtual, o comando `python` irá automaticamente se referir à versão correta para que você possa digitar `python` em vez de `python3`.
