diff --git a/README.md b/README.md index bd5cf49cd89..691a0a08ec5 100644 --- a/README.md +++ b/README.md @@ -9,13 +9,13 @@ The Django Girls Tutorial is licensed under a [*Creative Commons Attribution-Sha # Editing basics -The source code of the tutorial is [hosted on Github](https://github.com/DjangoGirls/tutorial). The Github [Fork & Pull workflow](https://help.github.com/articles/using-pull-requests) is used to accept and review changes. +The source code of the tutorial is [hosted on GitHub](https://github.com/DjangoGirls/tutorial). The GitHub [Fork & Pull workflow](https://help.github.com/articles/using-pull-requests) is used to accept and review changes. The tutorial uses the [GitBook](https://legacy.gitbook.com/) service for publishing its documentation. [See more information about how GitBook works](https://help.gitbook.com/). The tutorial is written in [Markdown mark up language](https://help.github.com/articles/markdown-basics). -You can find any discussions about the contents of the tutorial on the [Github issue tracker](https://github.com/DjangoGirls/tutorial/issues). +You can find any discussions about the contents of the tutorial on the [GitHub issue tracker](https://github.com/DjangoGirls/tutorial/issues). [Crowdin](https://crowdin.com/project/django-girls-tutorial) platform is used to manage translations. If you want to join an existing translation team or launch a new translation, send an email to the [translation managers](mailto:translations@djangogirls.org) or contact [support team](mailto:hello@djangogirls.org). If you want to propose some small changes or fix typos in existing translations, please create a Pull Request. @@ -23,12 +23,12 @@ You can find any discussions about the contents of the tutorial on the [Github i For contributing to the tutorial the following is needed to get started: -* a [Github account](https://github.com) -* in the case of complex edits familiarity with [Git command line basics](https://help.github.com/articles/set-up-git) or familiarity with an app ([Windows](https://windows.github.com/), [Mac](https://mac.github.com/)) to push your edits made on your computer to Github. +* a [GitHub account](https://github.com) +* in the case of complex edits familiarity with [Git command line basics](https://help.github.com/articles/set-up-git) or familiarity with an app ([Windows](https://windows.github.com/), [Mac](https://mac.github.com/)) to push your edits made on your computer to GitHub. ## Fork the repository -First fork the [DjangoGirls/tutorial](https://github.com/DjangoGirls/tutorial) repository to your personal Github account: +First fork the [DjangoGirls/tutorial](https://github.com/DjangoGirls/tutorial) repository to your personal GitHub account: ![Fork button](contributing/images/fork.png) @@ -36,9 +36,9 @@ First fork the [DjangoGirls/tutorial](https://github.com/DjangoGirls/tutorial) r ## Simple changes -For simple changes like typo corrections you can use the Github online editor: +For simple changes like typo corrections you can use the GitHub online editor: -* Open your local fork page on Github, +* Open your local fork page on GitHub, * go to *README.md* file in any chapter, * press the *Edit* icon (pen) @@ -48,7 +48,7 @@ and you can edit the chapter directly on github.com. Markdown syntax is used to edit the individual pages of the tutorial. -![Github editor](contributing/images/github_editor.png) +![GitHub editor](contributing/images/github_editor.png) Save your changes and create a pull request as explained below. @@ -56,7 +56,7 @@ Save your changes and create a pull request as explained below. For adding new chapters, writing longer snippets of text or adding images, you need to get a copy of the tutorial to your local computer. -Either use the Github app for your operating system (mentioned above) or `git` command line to get the repository locally. You get the repository address from the front page of your own Github repository fork: +Either use the GitHub app for your operating system (mentioned above) or `git` command line to get the repository locally. You get the repository address from the front page of your own GitHub repository fork: git clone git@github.com:yourgithubusername/tutorial.git @@ -70,7 +70,7 @@ Then you can open the tutorial in GitBook Editor (*File* > *Open book*). Make any changes in the tutorial using GitBook and then save changes (*Book* > *Save all*). -Then commit the changes using `git` and push the changes to your remote Github repository. +Then commit the changes using `git` and push the changes to your remote GitHub repository. Example: @@ -101,9 +101,9 @@ If you don't want to download the GitBook Editor app you can also go to the [Git # Making a pull request -After you have finished your changes you need to create [a pull request](https://help.github.com/articles/using-pull-requests) on Github. DjangoGirls will get notified about the pull request, review your changes, suggest any corrections if needed and then *pull* your changes to the master version. +After you have finished your changes you need to create [a pull request](https://help.github.com/articles/using-pull-requests) on GitHub. DjangoGirls will get notified about the pull request, review your changes, suggest any corrections if needed and then *pull* your changes to the master version. -In your own repository on Github press do *Compare & pull request* +In your own repository on GitHub press do *Compare & pull request* ![Compare & pull request](contributing/images/pull_request.png) @@ -111,7 +111,7 @@ Fill in the information *why* this change is being made. The reviewer can see th Then press *Create pull request*. -Github emails will notify you for the follow up process. +GitHub emails will notify you for the follow up process. # Further information and help diff --git a/cs/django_forms/README.md b/cs/django_forms/README.md index f70ecd1a30d..8ea26f584c1 100755 --- a/cs/django_forms/README.md +++ b/cs/django_forms/README.md @@ -365,7 +365,7 @@ Vzhledem k tomu, že jsi pravděpodobně přihlášená, neuvidíš žádnou zm Uvidíme, jestli to funguje na PythonAnywhere. Čas na další nasazení! -* Za prvé commitni nový kód a pošli ho na Github +* Za prvé commitni nový kód a pošli ho na GitHub ``` $ git status diff --git a/cs/django_templates/README.md b/cs/django_templates/README.md index 187fa29351d..97c487fcdd7 100755 --- a/cs/django_templates/README.md +++ b/cs/django_templates/README.md @@ -72,7 +72,7 @@ Všimla sis, že jsme tentokrát použily lehce odlišnou notaci (`{{ post.title Bylo by dobré vidět, jestli tvá webová stránka bude stále fungovat i na webu, že? Pojďme zkusit další nasazení/deploy na PythonAnywhere. Tady je rekapitulace postupu... -* Nejdřív hoď svůj kód na Github +* Nejdřív hoď svůj kód na GitHub ``` $ git status diff --git a/cs/html/README.md b/cs/html/README.md index 503feb1e10e..929acd7ff9b 100755 --- a/cs/html/README.md +++ b/cs/html/README.md @@ -156,7 +156,7 @@ Co ve skutečnosti chceme, je zobrazit opravdové příspěvky přidané v naše Bylo by fajn vidět všecho tohle venku a živě na internetu, že ano? Pojďme udělat další PythonAnywhere nasazení (deploy): -### Commitni a hoď svůj kód na Github +### Commitni a hoď svůj kód na GitHub Nejdříve se podívejme, které soubory se změnily od posledního nasazení (deploy). Zadej tyto příkazy lokálně (ne na PythonAnywhere): @@ -186,7 +186,7 @@ $ git commit -m "Změněn HTML kód stránek." > **Poznámka** Ujisti se, že používáš dvojité uvozovky kolem zprávy. -Jakmile jsme s tímto hotovy, nahrajeme (push) naše změny na Github: +Jakmile jsme s tímto hotovy, nahrajeme (push) naše změny na GitHub: ``` git push diff --git a/en/chromebook_setup/instructions.md b/en/chromebook_setup/instructions.md index a9450ecf181..e46b7f24909 100644 --- a/en/chromebook_setup/instructions.md +++ b/en/chromebook_setup/instructions.md @@ -60,9 +60,9 @@ pip install django~=1.11.0 (note that on the last line we use a tilde followed by an equal sign: ~=). -### Github +### GitHub -Make a [Github](https://github.com) account. +Make a [GitHub](https://github.com) account. ### PythonAnywhere diff --git a/en/django_forms/README.md b/en/django_forms/README.md index fd3aa158c7d..6abc0a130fb 100644 --- a/en/django_forms/README.md +++ b/en/django_forms/README.md @@ -400,7 +400,7 @@ Since you're likely logged in, if you refresh the page, you won't see anything d Let's see if all this works on PythonAnywhere. Time for another deploy! -* First, commit your new code, and push it up to Github: +* First, commit your new code, and push it up to GitHub: {% filename %}command-line{% endfilename %} ``` diff --git a/en/django_templates/README.md b/en/django_templates/README.md index dafc475c33a..29d01ff7e94 100644 --- a/en/django_templates/README.md +++ b/en/django_templates/README.md @@ -71,7 +71,7 @@ Have you noticed that we used a slightly different notation this time (`{{ post. It'd be good to see if your website will still be working on the public Internet, right? Let's try deploying to PythonAnywhere again. Here's a recap of the steps… -* First, push your code to Github +* First, push your code to GitHub {% filename %}command-line{% endfilename %} ``` diff --git a/en/html/README.md b/en/html/README.md index d30a8ed7cec..33bedce7b83 100644 --- a/en/html/README.md +++ b/en/html/README.md @@ -152,7 +152,7 @@ What we really want to do is display real posts added in our Django admin – an It'd be good to see all this out and live on the Internet, right? Let's do another PythonAnywhere deploy: -### Commit, and push your code up to Github +### Commit, and push your code up to GitHub First off, let's see what files have changed since we last deployed (run these commands locally, not on PythonAnywhere): diff --git a/fr/deploy/README.md b/fr/deploy/README.md index 23c960ff304..ba98a6033f1 100755 --- a/fr/deploy/README.md +++ b/fr/deploy/README.md @@ -8,11 +8,11 @@ Comme vous l'avez appris, un site web a besoin d'être installé sur un serveur. [1]: https://www.pythonanywhere.com/ -Nous allons aussi utiliser les services [GitHub][2], ce qui nous permettra d'héberger notre code en ligne. Il existe d'autres entreprises qui proposent des services similaires. Cependant, presque tous⋅tes les développeurs·ses possèdent aujourd'hui un compte Github et, dans quelques instants, vous aussi ! +Nous allons aussi utiliser les services [GitHub][2], ce qui nous permettra d'héberger notre code en ligne. Il existe d'autres entreprises qui proposent des services similaires. Cependant, presque tous⋅tes les développeurs·ses possèdent aujourd'hui un compte GitHub et, dans quelques instants, vous aussi ! [2]: https://www.github.com -Github va nous servir d'intermédiaire pour envoyer et récupérer notre code sur PythonAnywhere. +GitHub va nous servir d'intermédiaire pour envoyer et récupérer notre code sur PythonAnywhere. # Git @@ -110,7 +110,7 @@ Tapez les instructions suivantes dans votre console (remplacez ` **Note** : PythonAnywhere utilise Linux. Si vous êtes sous Windows, la console sera un peu différente de celle de votre ordinateur. -Importons notre code depuis Github vers PythonAnywhere en créant un "clone" de notre dépôt. Tapez la commande suivante dans la console de PythonAnywhere (n'oubliez pas d'utiliser votre nom d'utilisateur Github à la place de ``): +Importons notre code depuis GitHub vers PythonAnywhere en créant un "clone" de notre dépôt. Tapez la commande suivante dans la console de PythonAnywhere (n'oubliez pas d'utiliser votre nom d'utilisateur GitHub à la place de ``): $ git clone https://github.com//my-first-blog.git diff --git a/fr/django_forms/README.md b/fr/django_forms/README.md index fbfd803d507..ef39dce3dd5 100755 --- a/fr/django_forms/README.md +++ b/fr/django_forms/README.md @@ -368,7 +368,7 @@ Comme vous êtes probablement connectée, vous ne verrez aucune différence si v Nos modifications fonctionnent-elles sur PythonAnywhere ? Pour le savoir, déployons à nouveau ! -* Tout d'abord, commitez votre nouveau code et pushez-le à nouveau sur Github +* Tout d'abord, commitez votre nouveau code et pushez-le à nouveau sur GitHub ``` $ git status $ git add --all . diff --git a/hu/django_templates/README.md b/hu/django_templates/README.md index bb4d32a81da..d4407fe2a35 100644 --- a/hu/django_templates/README.md +++ b/hu/django_templates/README.md @@ -71,7 +71,7 @@ Próbáld ki a template-edben. Jó lenne látni, hogy a weblapod még mindig működik az Interneten, nem igaz? Telepítsük újra a PythonAnywhere-en. Itt a lépések összefoglalója... -* Először tedd fel a kódot a Github-ra +* Először tedd fel a kódot a GitHub-ra ``` $ git status [...] diff --git a/hu/html/README.md b/hu/html/README.md index cb4e60bd7cb..46211c0880c 100644 --- a/hu/html/README.md +++ b/hu/html/README.md @@ -156,7 +156,7 @@ Amit igazából szeretnénk, hogy igazi posztokat jelenítünk meg, amiket a Dja Jó lenne lenne látni ezt az egészet élesben az interneten, ugye? Csináljunk egy újabb PythonAnywhere deploy-t: -### Commit, és push a Github-ra +### Commit, és push a GitHub-ra Először nézzük meg, hogy milyen fájlok változtak a legutóbbi deploy óta (futtasd az alábbi parancsot a gépeden, ne PythonAnywhere-en): @@ -182,7 +182,7 @@ Már majdnem készen is vagyunk, de előtte el kell mentenünk a változtatások > **Megjegyzés** Győződj meg róla, hogy idézőjelet használsz a commit üzenetnél. -Miután ezzel megvagy, töltsd fel (push) a változtatásaidat Github-ra: +Miután ezzel megvagy, töltsd fel (push) a változtatásaidat GitHub-ra: $ git push diff --git a/it/django_forms/README.md b/it/django_forms/README.md index 2598ee9bd71..adedce6697f 100644 --- a/it/django_forms/README.md +++ b/it/django_forms/README.md @@ -368,7 +368,7 @@ Ora, dato che probabilmente sei connessa/o, se aggiorni la pagina non troverai a Vediamo se funziona su PythonAnywhere. È l'ora di un altro deploy! -* Innanzitutto, fai un commit del tuo nuovo codice e fai il push per caricarlo su Github +* Innanzitutto, fai un commit del tuo nuovo codice e fai il push per caricarlo su GitHub ``` $ git status diff --git a/it/django_templates/README.md b/it/django_templates/README.md index c2697f5a341..25fde878ddd 100644 --- a/it/django_templates/README.md +++ b/it/django_templates/README.md @@ -71,7 +71,7 @@ Ti sei accorto che abbiamo utilizzato una notazione leggermente diversa questa v Sarebbe bello vedere se il tuo sito funziona ancora su Internet, giusto? Proviamo a fare il deploy su PythonAnywhere di nuovo. Ecco un riepilogo dei passaggi... -* Prima di tutto, fai il push del tuo codice verso Github +* Prima di tutto, fai il push del tuo codice verso GitHub $ git status [...] diff --git a/it/html/README.md b/it/html/README.md index cd7287f49d8..e907dc239b4 100644 --- a/it/html/README.md +++ b/it/html/README.md @@ -181,7 +181,7 @@ Ci siamo quasi, ora è il momento di dirgli di salvare questa modifica nella cro > **Nota** Assicurati di usare doppie virgolette attorno al messaggio di commit. -Quando hai finito, caricheremo (push) le nostre modifiche su Github: +Quando hai finito, caricheremo (push) le nostre modifiche su GitHub: git push diff --git a/ko/chromebook_setup/instructions.md b/ko/chromebook_setup/instructions.md index 7cf699d815f..39cf4c3e54a 100755 --- a/ko/chromebook_setup/instructions.md +++ b/ko/chromebook_setup/instructions.md @@ -46,9 +46,9 @@ pip install django~=1.11.0 (마지막 줄에는 물결표 뒤에 등호(~=) 기호를 사용합니다) -### Github +### GitHub -[Github](https://github.com) 계정을 만드세요. +[GitHub](https://github.com) 계정을 만드세요. ### PythonAnywhere diff --git a/ko/deploy/README.md b/ko/deploy/README.md index 8494df05d9b..9e995678603 100755 --- a/ko/deploy/README.md +++ b/ko/deploy/README.md @@ -6,9 +6,9 @@ 앞에서 배웠듯이, 웹사이트는 서버라는 곳에 들어갑니다. 인터넷 상에 서버를 제공하는 업체들은 참 많습니다. 우리는 이 중에 비교적 배포 과정이 간단한 [PythonAnywhere](https://www.pythonanywhere.com/)을 사용할 거에요. PythonAnywhere는 방문자가 아주 많지 않은 소규모 애플리케이션을 위한 무료 서비스를 제공하고 있습니다. 지금 우리가 만드는 웹사이트도 해당됩니다. -우리가 사용할 다른 외부 서비스는 [GitHub](https://github.com/)이라는 코드 호스팅 서비스입니다. 요즘에는 모든 프로그래머들은 Github 계정을 가지고 있으니, 여러분도 Github 계정을 만들어봐요! +우리가 사용할 다른 외부 서비스는 [GitHub](https://github.com/)이라는 코드 호스팅 서비스입니다. 요즘에는 모든 프로그래머들은 GitHub 계정을 가지고 있으니, 여러분도 GitHub 계정을 만들어봐요! -로컬컴퓨터, Github, Pythonanywhere 이 세 곳은 모두 중요해요. 로컬 컴퓨터는 개발 및 테스트를 수행하는 곳이 될 것입니다. 개발이 완료되면 프로그램 복사본을 GitHub에 저장합니다. 웹사이트는 PythonAnywhere에 있고 GitHub에서 코드 사본을 업데이트할 거에요. +로컬컴퓨터, GitHub, Pythonanywhere 이 세 곳은 모두 중요해요. 로컬 컴퓨터는 개발 및 테스트를 수행하는 곳이 될 것입니다. 개발이 완료되면 프로그램 복사본을 GitHub에 저장합니다. 웹사이트는 PythonAnywhere에 있고 GitHub에서 코드 사본을 업데이트할 거에요. # Git 설치하기 > **Note** 이미 설치가 완료되었다면, 다시 할 필요가 없어요. 다음 장으로 넘어가서 Git 저장소를 만드는 것부터 시작하세요. @@ -100,7 +100,7 @@ $ git commit -m "My Django Girls app, first commit" 이제 내 컴퓨터의 Git 저장소를 GitHub에 있는 저장소로 연결해야합니다. -콘솔에 다음과 같이 입력하세요. (``에 꺽쇠괄호(<>)를 떼고 내 Github 사용자이름을 입력하세요) +콘솔에 다음과 같이 입력하세요. (``에 꺽쇠괄호(<>)를 떼고 내 GitHub 사용자이름을 입력하세요) {% filename %}command-line{% endfilename %} ``` diff --git a/ko/django_forms/README.md b/ko/django_forms/README.md index 05285194903..5bbf63e12f6 100755 --- a/ko/django_forms/README.md +++ b/ko/django_forms/README.md @@ -408,7 +408,7 @@ https://docs.djangoproject.com/en/1.11/topics/forms/ 모든 작업을 끝마쳤으면 PythonAnywhere로 배포해야죠! -* 제일 먼저 코드를 커밋하고 Github로 푸시합니다. +* 제일 먼저 코드를 커밋하고 GitHub로 푸시합니다. {% filename %}command-line{% endfilename %} ``` diff --git a/ko/django_templates/README.md b/ko/django_templates/README.md index 97fb55b67c8..1d81a9ecdef 100755 --- a/ko/django_templates/README.md +++ b/ko/django_templates/README.md @@ -71,7 +71,7 @@ HTML에 여러분은 파이썬 코드를 바로 넣을 수 없어요. 브라우 나 혼자만 웹 사이트를 보는 게 아니라 다른 사람들도 인터넷으로 볼 수 있으면 참 좋겠죠? 이제 PythonAnywhere에 다시 여러분이 만든 블로그를 배포해봅시다. 아래에 각 단계별로 요약했어요. -* 제일 먼저, Github에 여러분의 코드를 git의 push를 사용해서 넣으세요. +* 제일 먼저, GitHub에 여러분의 코드를 git의 push를 사용해서 넣으세요. {% filename %}command-line{% endfilename %} ``` diff --git a/ko/html/README.md b/ko/html/README.md index 167a3dfe05a..d5c61a1bcfe 100755 --- a/ko/html/README.md +++ b/ko/html/README.md @@ -149,7 +149,7 @@ blog 방금 고친 내용을 인터넷에서도 봐야겠죠? PythonAnywhere으로도 배포해 봅시다. -### Github에 코드를 커밋, 푸시하세요! +### GitHub에 코드를 커밋, 푸시하세요! 제일 먼저, 마지막 배포 이후 수정된 파일을 확인해 봅시다. (PythonAnywhere가 아닌 로컬에서 실행하세요) diff --git a/pt/chromebook_setup/instructions.md b/pt/chromebook_setup/instructions.md index 5957ae7005a..20f7cae4b83 100644 --- a/pt/chromebook_setup/instructions.md +++ b/pt/chromebook_setup/instructions.md @@ -61,9 +61,9 @@ pip install django~=1.9.0 (note que na última linha nós usamos um "til" seguido de um sinal de igual: ~=). -### Github +### GitHub -Crie uma conta no [Github](https://github.com). +Crie uma conta no [GitHub](https://github.com). ### PythonAnywhere diff --git a/pt/django_forms/README.md b/pt/django_forms/README.md index 2cda1a4fcd9..d5adcc42ac4 100755 --- a/pt/django_forms/README.md +++ b/pt/django_forms/README.md @@ -397,7 +397,7 @@ Como você deve estar "logada", se você atualizar a página, não verá nada de Vamos ver se tudo isso funciona na PythonAnywhere. Tempo para outro deploy! -* Primeiro, commit o seu novo código e coloque no Github +* Primeiro, commit o seu novo código e coloque no GitHub ```bash $ git status diff --git a/pt/django_templates/README.md b/pt/django_templates/README.md index 6f769a43a01..8a524461170 100755 --- a/pt/django_templates/README.md +++ b/pt/django_templates/README.md @@ -72,7 +72,7 @@ Você notou que dessa vez nós usamos uma notação um pouco diferente `{{ post. Seria bom ver se seu site ainda estará funcionando na internet, certo? Vamos tentar fazer a implantação na PythonAnywhere novamente. Aqui está um resumo dos passos... -* Primeiro, envie seu código para o Github +* Primeiro, envie seu código para o GitHub {% filename %}command-line{% endfilename %} ``` diff --git a/ru/deploy/README.md b/ru/deploy/README.md index 0fd670a0ef7..170871a35bc 100755 --- a/ru/deploy/README.md +++ b/ru/deploy/README.md @@ -53,7 +53,7 @@ db.sqlite3 > **Примечание:** точка в начале имени файла имеет важное значение! Если у тебя есть проблемы с созданием таких файлов (Mac не позволит создать файл с названием, начинающимся с точки, через Finder, например), тогда используй кнопку «Сохранить как» в меню своего редактора кода, это точно поможет. -> **Примечание:** среди файлов, которые мы перечислили в `.gitignore`, есть `db.sqlite3`. Этот файл содержит твою локальную базу данных, где будут храниться твои посты. Мы не добавляем его в репозиторий, поскольку твой сайт на PythonAnywhere будет использовать другую базу данных. Эта база данных тоже может быть SQLite, как на твоём рабочем компьютере, но обычно используется MySQL, которая может справиться с большим количеством посетителей, чем SQLite. В любом случае, поскольку мы не копируем базу данных SQLite на Github, все посты, которые ты уже создала, будут доступны только на твоём локальном компьютере, и тебе придётся заново создать их на опубликованном сайте. Рассматривай свою локальную базу данных как удобную игровую площадку, где ты можешь тестировать различные идеи и не бояться удалить настоящий пост из своего блога. +> **Примечание:** среди файлов, которые мы перечислили в `.gitignore`, есть `db.sqlite3`. Этот файл содержит твою локальную базу данных, где будут храниться твои посты. Мы не добавляем его в репозиторий, поскольку твой сайт на PythonAnywhere будет использовать другую базу данных. Эта база данных тоже может быть SQLite, как на твоём рабочем компьютере, но обычно используется MySQL, которая может справиться с большим количеством посетителей, чем SQLite. В любом случае, поскольку мы не копируем базу данных SQLite на GitHub, все посты, которые ты уже создала, будут доступны только на твоём локальном компьютере, и тебе придётся заново создать их на опубликованном сайте. Рассматривай свою локальную базу данных как удобную игровую площадку, где ты можешь тестировать различные идеи и не бояться удалить настоящий пост из своего блога. Используй команду `git status` перед `git add` или в любой другой момент, когда ты не уверена, что изменения — хорошая идея. Это убережёт тебя от таких неприятных сюрпризов, как добавление неправильных файлов. Команда `git status` возвращает информацию обо всех ранее неотслеживаемых/изменённых/добавленных в git файлах, а также статус ветки и многое другое. Результат должен быть похож на: diff --git a/ru/django_forms/README.md b/ru/django_forms/README.md index 2178859f898..fdf7623d7ac 100755 --- a/ru/django_forms/README.md +++ b/ru/django_forms/README.md @@ -410,7 +410,7 @@ form = PostForm(instance=post) Теперь давай посмотрим, как это будет работать на PythonAnywhere. Пришло время для очередного развёртывания! -* Сначала нам нужно сделать commit и push нового кода в репозиторий Github +* Сначала нам нужно сделать commit и push нового кода в репозиторий GitHub {% filename %}command-line{% endfilename %} ``` diff --git a/ru/django_templates/README.md b/ru/django_templates/README.md index a8bb37e22fb..184b0e7da30 100755 --- a/ru/django_templates/README.md +++ b/ru/django_templates/README.md @@ -76,7 +76,7 @@ __Теги шаблонов Django__ позволяют нам вставлят Пришло время ещё раз убедиться, что наш сайт будет работать в сети, согласна? Попробуем развернуть новую версию сайта на PythonAnywhere. Краткий обзор необходимых шагов... -* Сначала загружаем код на Github +* Сначала загружаем код на GitHub {% filename %}command-line{% endfilename %} ``` diff --git a/ru/html/README.md b/ru/html/README.md index a75a1c30b1a..bc0948fb16c 100755 --- a/ru/html/README.md +++ b/ru/html/README.md @@ -161,7 +161,7 @@ blog Хотелось бы увидеть всё это в живую в интернете, согласна? Давай проведем еще одно развертывание веб-сайта на PythonAnywhere. -### Commit и push кода в репозиторий Github +### Commit и push кода в репозиторий GitHub Во-первых, давай посмотрим, какие файлы были изменены с момента последнего развёртывания (выполни эти команды локально, не на PythonAnywhere): @@ -196,7 +196,7 @@ $ git commit -m "Changed the HTML for the site." > __Примечание__: убедись, что используешь двойные кавычки вокруг комментария. -После того, как мы сделали это, мы загрузим (заpush'им) изменения на Github: +После того, как мы сделали это, мы загрузим (заpush'им) изменения на GitHub: {% filename %}command-line{% endfilename %} ``` diff --git a/sk/chromebook_setup/instructions.md b/sk/chromebook_setup/instructions.md index 1dd47b4853a..6f0c9821a95 100644 --- a/sk/chromebook_setup/instructions.md +++ b/sk/chromebook_setup/instructions.md @@ -47,9 +47,9 @@ Ak to ešte stále nefunguje, požiadaj svojho mentora/ku o pomoc. (všimni si, že v poslednom riadku sme použili vlnovku a za ňou znamienko rovnosti). -### Github +### GitHub -Vytvor si [Github](https://github.com) účet. +Vytvor si [GitHub](https://github.com) účet. ### PythonAnywhere diff --git a/sk/deploy/README.md b/sk/deploy/README.md index 00b62aca9a6..5732ecf45b7 100755 --- a/sk/deploy/README.md +++ b/sk/deploy/README.md @@ -107,7 +107,7 @@ A nakoniec uložíme naše zmeny. Teraz prejdi na konzolu a zadaj nasledujúce p $ git remote add origin https://github.com//my-first-blog.git $ git push -u origin master -
Zadaj svoje Github uživateľské meno a heslo a uvidíš niečo podobné tomuto: +
Zadaj svoje GitHub uživateľské meno a heslo a uvidíš niečo podobné tomuto: {% filename %}command-line{% endfilename %} diff --git a/sk/django_forms/README.md b/sk/django_forms/README.md index ba7a8c37a03..04604e86c68 100755 --- a/sk/django_forms/README.md +++ b/sk/django_forms/README.md @@ -422,7 +422,7 @@ Kedže si pravdepodobne prihlásená, ak obnovíš stránku, neuvidíš nič. Na Pozrime sa, či to všetko funguje na PythonAnywhere. Je čas na ďalšie nasadenie! -* Najprv ulož (commit) svoj nový kód a pošli ho na Github: +* Najprv ulož (commit) svoj nový kód a pošli ho na GitHub: {% filename %}command-line{% endfilename %} diff --git a/sk/django_templates/README.md b/sk/django_templates/README.md index 47d66eb4c3a..98d448383ac 100755 --- a/sk/django_templates/README.md +++ b/sk/django_templates/README.md @@ -74,7 +74,7 @@ Všimla si si, že sme tentokrát použili trochu iný zápis `{{ post.title }}` Bolo by fajn vidieť či bude tvoja web stránka stále funkčná aj na Internete, však? Skúsme to znova nasadiť na PythonAnywhere. Tu je rekapitulácia postupu… -* Najskôr pošli svoj kód na Github +* Najskôr pošli svoj kód na GitHub {% filename %}command-line{% endfilename %} diff --git a/sk/html/README.md b/sk/html/README.md index dbd8ba707d9..5800c122cae 100755 --- a/sk/html/README.md +++ b/sk/html/README.md @@ -154,7 +154,7 @@ To čo v skutočnosti chceme spraviť je zobraziť reálne príspevky pridané v Bolo by skvelé, ak by sme všetky tieto veci mohli vidieť naživo na Internete, že? Spravme ďalšie PythonAnywhere nasadenie: -### Commitni a pošli svoj kód na Github +### Commitni a pošli svoj kód na GitHub Najprv sa pozrime, ktoré súbory sa zmenili od posledného nasadenia (tieto príkazy spusti lokálne, nie na PythonAnywhere): @@ -188,7 +188,7 @@ Už sme skoro tam, teraz nastal čas mu povedať, aby uložil tieto zmeny v jeho > **Poznámka** - Uisti sa, že si použila dvojité úvodzovky okolo commit správy. -Po tom, čo sme to dokončili, nahráme (push) naše zmeny na Github: +Po tom, čo sme to dokončili, nahráme (push) naše zmeny na GitHub: {% filename %}command-line{% endfilename %} diff --git a/tr/chromebook_setup/instructions.md b/tr/chromebook_setup/instructions.md index 5c9efd9f39d..62280a52133 100644 --- a/tr/chromebook_setup/instructions.md +++ b/tr/chromebook_setup/instructions.md @@ -47,9 +47,9 @@ Sonra, çalıştır: (son satırda bir tılde ve eşitlik işareti kullandığımıza dikkat edin: ~=). -### Github +### GitHub -Bir [Github](https://github.com) hesabı açın. +Bir [GitHub](https://github.com) hesabı açın. ### PythonAnywhere diff --git a/tr/deploy/README.md b/tr/deploy/README.md index 791b471a256..2d5b52da101 100644 --- a/tr/deploy/README.md +++ b/tr/deploy/README.md @@ -6,9 +6,9 @@ Öğrendiğimiz üzere, bir websitesi bir sunucunun üstünde olmalıdır. İnternette bir çok sunucu sağlayıcısı var, biz [PythonAnywhere](https://www.pythonanywhere.com/) kullanacağız. PythonAnywhere ücretsizdir ve çok fazla ziyaretçisi olmayan küçük uygulamalar içindir yani şu anlık sizin için kesinlikle yeterli olacaktır. -Dışarıdan kullanacağımız diğer servis bir kod barındırma hizmeti olan [Github](https://www.github.com). Başkaları da var, ama nerdeyse her programcının bir Github hesabı var, sizin de olacak! +Dışarıdan kullanacağımız diğer servis bir kod barındırma hizmeti olan [GitHub](https://www.github.com). Başkaları da var, ama nerdeyse her programcının bir GitHub hesabı var, sizin de olacak! -Bu üç yer sizin için önemli olacak. Lokal bilgisayarınız geliştirme ve test yaptığınız yer olacak. Değişikliklerden memnun olduğunuzda programınızın bir kopyasını Github'a koyacaksınız. Web siteniz PythonAnywhere üzerinde olacak ve onu kodunuzun bir kopyasını Github'dan alarak günceleyeceksiniz. +Bu üç yer sizin için önemli olacak. Lokal bilgisayarınız geliştirme ve test yaptığınız yer olacak. Değişikliklerden memnun olduğunuzda programınızın bir kopyasını GitHub'a koyacaksınız. Web siteniz PythonAnywhere üzerinde olacak ve onu kodunuzun bir kopyasını GitHub'dan alarak günceleyeceksiniz. # Git @@ -137,7 +137,7 @@ Username for 'https://github.com': zeynep Password for 'https://zeynep@github.co > **Not** PythonAnywhere Linux tabanlıdır, yani Windows kullanıyorsanız bu konsol bilgisayarınızdakinden biraz daha farklı görünecektir. - Reponuzun bir klonunu yaratarak kodumuzu Github'dan PythonAnywhere üzerine çekelim. Aşağıdakileri PythonAnywhere konsoluna geçirin (`<your-github-username>` yerine GitHub kullanıcı adınızın geleceğini unutmayın): + Reponuzun bir klonunu yaratarak kodumuzu GitHub'dan PythonAnywhere üzerine çekelim. Aşağıdakileri PythonAnywhere konsoluna geçirin (`<your-github-username>` yerine GitHub kullanıcı adınızın geleceğini unutmayın): {% filename %}PythonAnywhere command-line{% endfilename %} diff --git a/tr/django_forms/README.md b/tr/django_forms/README.md index cb4afc5b381..d0776334004 100644 --- a/tr/django_forms/README.md +++ b/tr/django_forms/README.md @@ -422,7 +422,7 @@ Yüksek olasılıkla login yapmış olduğunuz için sayfayı yenilediğinizde f Bakalım PythonAnywhere'de calışacak mı? Tekrar yayına alalım! -* İlk önce kodumuzu commit edelim, sonra Github'a push edelim: +* İlk önce kodumuzu commit edelim, sonra GitHub'a push edelim: {% filename %}komut-satırı{% endfilename %} diff --git a/tr/django_templates/README.md b/tr/django_templates/README.md index b7eeb65dfa9..32d663a5a15 100644 --- a/tr/django_templates/README.md +++ b/tr/django_templates/README.md @@ -74,7 +74,7 @@ Bu sefer biraz daha farklı bir notasyon kullandığımızın farkında mısın Websitenizi internette çalışır halde görmek iyi olur değilmi? PythonAnywhere tekrar çalıştıralım. Adımları hatırlayalım… -* İlk önce kodumuzu Github'a push komutu ile yükleyelim +* İlk önce kodumuzu GitHub'a push komutu ile yükleyelim {% filename %}komut-satırı{% endfilename %} diff --git a/tr/html/README.md b/tr/html/README.md index 0c8070ae42e..3c49d7cc1f2 100644 --- a/tr/html/README.md +++ b/tr/html/README.md @@ -154,7 +154,7 @@ Aslında yapmak istediğimiz Django yöneticimize eklenen gerçek postaları aç Bunları İnternet'te canlı olarak görmek çok güzel olur, değil mi: -### Kodumuzu commit ve push komutları ile Github'a yükleyelim +### Kodumuzu commit ve push komutları ile GitHub'a yükleyelim İlk önce son deployment dan sonra hangi dosyaların değiştiğine bakalım. Bu komutları lokal bilgisayarımızda çalıştıralım, PythonAnywhere'de değil: diff --git a/uk/django_templates/README.md b/uk/django_templates/README.md index 27f10841e47..aaa7ba667e3 100755 --- a/uk/django_templates/README.md +++ b/uk/django_templates/README.md @@ -65,7 +65,7 @@ __Шаблонні теги Django__ дозволяють нам передав Було б непогано побачити як ваш сайт буде працювати в інтернеті, так? Давайте спробуєм розгорнути його в PythonAnywhere знову. Ось наступні кроки... -* По-перше, залийте ваш код на Github +* По-перше, залийте ваш код на GitHub ``` $ git status diff --git a/zh/deploy/README.md b/zh/deploy/README.md index af3cfcc4846..4398d3f6f9f 100755 --- a/zh/deploy/README.md +++ b/zh/deploy/README.md @@ -98,7 +98,7 @@ Git会追踪这个目录下所有文件和文件夹的更改，但是有一些 [4]: images/github_get_repo_url_screenshot.png -现在我们需要把你电脑上的Git仓库和Github上的挂接。 +现在我们需要把你电脑上的Git仓库和GitHub上的挂接。 在控制台输入以下内容（替换 `` 为你的 github 用户名 ，不包含尖括号）： @@ -106,7 +106,7 @@ Git会追踪这个目录下所有文件和文件夹的更改，但是有一些 $ git push -u origin master -输入你的Github账号名和密码，然后你会看到这样： +输入你的GitHub账号名和密码，然后你会看到这样： Username for 'https://github.com': hjwp Password for 'https://hjwp@github.com': @@ -120,7 +120,7 @@ Git会追踪这个目录下所有文件和文件夹的更改，但是有一些 -你的代码已经在Github上了。 快去确认一下吧！ 你会发现这些好家伙们 — [Django][5], [Django Girls Tutorial][6]，还有很多其它优秀的开放源代码软件项目同样也在Github上 :) +你的代码已经在GitHub上了。 快去确认一下吧！ 你会发现这些好家伙们 — [Django][5], [Django Girls Tutorial][6]，还有很多其它优秀的开放源代码软件项目同样也在GitHub上 :) [5]: https://github.com/django/django [6]: https://github.com/DjangoGirls/tutorial @@ -137,7 +137,7 @@ Git会追踪这个目录下所有文件和文件夹的更改，但是有一些 > **注意** PythonAnywhere 基于 Linux，因此如果你使用 Windows，控制台将会和你本地电脑上的略有不同。 -让我们通过创建一个我们仓库的 “Clone” 以便从 Github 拉取代码到 PythonAnywhere。 在 PythonAnywhere 控制台输入以下 (不要忘记使用 Github 用户名替换 ``)： +让我们通过创建一个我们仓库的 “Clone” 以便从 GitHub 拉取代码到 PythonAnywhere。 在 PythonAnywhere 控制台输入以下 (不要忘记使用 GitHub 用户名替换 ``)： $ git clone https://github.com//my-first-blog.git diff --git a/zh/django_forms/README.md b/zh/django_forms/README.md index 6fd7e153bfa..7af33e31d12 100755 --- a/zh/django_forms/README.md +++ b/zh/django_forms/README.md @@ -393,7 +393,7 @@ def post_edit(request, pk): 我们来看看这一切能否运行在 PythonAnywhere 上。另一次部署的时间到了！ -* 首先，提交你的新代码，然后将它推送到 Github 上 +* 首先，提交你的新代码，然后将它推送到 GitHub 上 ``` diff --git a/zh/django_templates/README.md b/zh/django_templates/README.md index 84f11a73002..3a4af4cccf5 100755 --- a/zh/django_templates/README.md +++ b/zh/django_templates/README.md @@ -76,7 +76,7 @@ 如果我们将我们的网站放在互联网上运行，那将是一件很不错的事情，难道不是吗？ 让我们试着再次部署到 PythonAnywhere。简单部署步骤如下... ... -* 首先，我们将我们的代码放到Github +* 首先，我们将我们的代码放到GitHub ``` $ git status diff --git a/zh/installation/README.md b/zh/installation/README.md index ead258cfb44..afd992a2c49 100755 --- a/zh/installation/README.md +++ b/zh/installation/README.md @@ -28,7 +28,7 @@ {% include "/deploy/install_git.md" %} -# 创建一个 Github 账户 +# 创建一个 GitHub 账户 前往 [GitHub.com](https://www.github.com) 并注册一个新的账号。