From af11203982739d02e6f0afbd479f4ff12f520b0c Mon Sep 17 00:00:00 2001 From: TomKellyGenetics Date: Tue, 10 Aug 2021 23:57:32 +0900 Subject: [PATCH] Revert "update formatting for git lessons" This reverts commit 87171c0550ac99f6c0d5f66074f5bfef9da9834b. --- po/git-novice.ja.po | 2621 +++++++++++++++++++++++++++++-------------- 1 file changed, 1770 insertions(+), 851 deletions(-) diff --git a/po/git-novice.ja.po b/po/git-novice.ja.po index bd91abea..50da4048 100644 --- a/po/git-novice.ja.po +++ b/po/git-novice.ja.po @@ -63,7 +63,8 @@ msgstr "# プロジェクトに貢献する" #: git-novice/CONTRIBUTING.md:3 msgid "" -"[Software Carpentry][swc-site] and [Data Carpentry][dc-site] are open source projects,\n" +"[Software Carpentry][swc-site] and [Data Carpentry][dc-site] are open source " +"projects,\n" "and we welcome contributions of all kinds:\n" "new lessons,\n" "fixes to existing material,\n" @@ -86,12 +87,16 @@ msgstr "## 貢献者の規約" #: git-novice/CONTRIBUTING.md:12 msgid "" "By contributing,\n" -"you agree that we may redistribute your work under [our license](LICENSE.md).\n" +"you agree that we may redistribute your work under [our license](LICENSE." +"md).\n" "In exchange,\n" -"we will address your issues and/or assess your change proposal as promptly as we can,\n" +"we will address your issues and/or assess your change proposal as promptly " +"as we can,\n" "and help you become a member of our community.\n" -"Everyone involved in [Software Carpentry][swc-site] and [Data Carpentry][dc-site]\n" -"agrees to abide by our [code of conduct](https://docs.carpentries.org/topic_folders/policies/code-of-conduct.html)." +"Everyone involved in [Software Carpentry][swc-site] and [Data Carpentry][dc-" +"site]\n" +"agrees to abide by our [code of conduct](https://docs.carpentries.org/" +"topic_folders/policies/code-of-conduct.html)." msgstr "" "このプロジェクトに貢献することにより、\n" "自身が提供したコンテンツを[私達のライセンス](License.md)に基づき配布する事に" @@ -101,7 +106,8 @@ msgstr "" "できるだけ早くコミュニティーの一員になれるよう尽力いたします。\n" "[Software Carpentry][swc-site]と[Data Carpentry][dc-site]の一員になられた際に" "は、\n" -"私達の[行動規範](https://docs.carpentries.org/topic_folders/policies/code-of-conduct.html)を遵守する事に同意していただきます。" +"私達の[行動規範](https://docs.carpentries.org/topic_folders/policies/code-of-" +"conduct.html)を遵守する事に同意していただきます。" # header #: git-novice/CONTRIBUTING.md:20 @@ -133,7 +139,8 @@ msgstr "1. [GitHub][github]アカウントをお持ちでない場合、" msgid "" " you can [send us comments by email][contact].\n" " However,\n" -" we will be able to respond more quickly if you use one of the other methods described below." +" we will be able to respond more quickly if you use one of the other " +"methods described below." msgstr "" " [メール][contact]にてご連絡して下さい。\n" " ですが、\n" @@ -149,7 +156,8 @@ msgstr "2. [GitHub][github]アカウントをすでにお持ちである方・" msgid "" " or are willing to [create one][github-join],\n" " but do not know how to use Git,\n" -" you can report problems or suggest improvements by [creating an issue][new-issue].\n" +" you can report problems or suggest improvements by [creating an issue]" +"[new-issue].\n" " This allows us to assign the item to someone\n" " and to respond to it in a threaded discussion." msgstr "" @@ -174,7 +182,8 @@ msgid "" msgstr "" " 既存の資料を変更、または追加したい方は、\n" " プルリクエスト(Pull Request)にて変更点を提出して下さい。\n" -" プルリクエストを使った提出方法は、[下記に記載されています](#using-github)。" +" プルリクエストを使った提出方法は、[下記に記載されています](#using-" +"github)。" # header #: git-novice/CONTRIBUTING.md:46 @@ -192,7 +201,8 @@ msgid "" " which can be viewed at ." msgstr "" " から編集して下さい。\n" -" ウェブサイトはこちらから観覧いただけます：" +" ウェブサイトはこちらから観覧いただけます：" # ordered list #: git-novice/CONTRIBUTING.md:52 @@ -219,8 +229,10 @@ msgstr "" #: git-novice/CONTRIBUTING.md:58 msgid "" " please work in .\n" -" The home page of that repository explains how to set up workshop websites,\n" -" while the extra pages in \n" +" The home page of that repository explains how to set up workshop " +"websites,\n" +" while the extra pages in \n" " provide more background on our design choices." msgstr "" " から編集して下さい。\n" @@ -238,7 +250,8 @@ msgstr "" #: git-novice/CONTRIBUTING.md:64 msgid "" -" or HTML boilerplate for lessons or workshops stored in `_includes` or `_layouts`,\n" +" or HTML boilerplate for lessons or workshops stored in `_includes` or " +"`_layouts`,\n" " please work in ." msgstr "" " HTML boilerplateなどを編集したい場合は、\n" @@ -296,7 +309,8 @@ msgstr "## 貢献していただきたくない個所" #: git-novice/CONTRIBUTING.md:88 msgid "" -"Our lessons already contain more material than we can cover in a typical workshop,\n" +"Our lessons already contain more material than we can cover in a typical " +"workshop,\n" "so we are usually *not* looking for more concepts or tools to add to them.\n" "As a rule,\n" "if you want to introduce a new idea,\n" @@ -317,8 +331,10 @@ msgstr "" #: git-novice/CONTRIBUTING.md:97 msgid "" -"We are also not looking for exercises or other material that only run on one platform.\n" -"Our workshops typically contain a mixture of Windows, Mac OS X, and Linux users;\n" +"We are also not looking for exercises or other material that only run on one " +"platform.\n" +"Our workshops typically contain a mixture of Windows, Mac OS X, and Linux " +"users;\n" "in order to be usable,\n" "our lessons must run equally well on all three." msgstr "" @@ -349,7 +365,8 @@ msgstr "" # ordered list #: git-novice/CONTRIBUTING.md:109 msgid "" -"1. The published copy of the lesson is in the `gh-pages` branch of the repository" +"1. The published copy of the lesson is in the `gh-pages` branch of the " +"repository" msgstr "" "1. 現在公開されているレッスン内容はリポジトリの`gh-pages`というブランチに保" "存されています" @@ -358,7 +375,8 @@ msgstr "" msgid "" " (so that GitHub will regenerate it automatically).\n" " Please create all branches from that,\n" -" and merge the [master repository][repo]'s `gh-pages` branch into your `gh-pages` branch\n" +" and merge the [master repository][repo]'s `gh-pages` branch into your " +"`gh-pages` branch\n" " before starting work.\n" " Please do *not* work directly in your `gh-pages` branch,\n" " since that will make it difficult for you to work on other contributions." @@ -379,10 +397,12 @@ msgstr "" #: git-novice/CONTRIBUTING.md:118 msgid "" -" 1. Create a new branch in your desktop copy of this repository for each significant change.\n" +" 1. Create a new branch in your desktop copy of this repository for each " +"significant change.\n" " 2. Commit the change in that branch.\n" " 3. Push that branch to your fork of this repository on GitHub.\n" -" 4. Submit a pull request from that branch to the [master repository][repo].\n" +" 4. Submit a pull request from that branch to the [master repository]" +"[repo].\n" " 5. If you receive feedback,\n" " make changes on your desktop and push to your branch on GitHub:\n" " the pull request will update automatically." @@ -418,7 +438,8 @@ msgstr "## その他の資料" #: git-novice/CONTRIBUTING.md:133 msgid "" -"General discussion of [Software Carpentry][swc-site] and [Data Carpentry][dc-site]\n" +"General discussion of [Software Carpentry][swc-site] and [Data Carpentry][dc-" +"site]\n" "happens on the [discussion mailing list][discuss-list],\n" "which everyone is welcome to join.\n" "You can also [reach us by email][contact]." @@ -439,7 +460,8 @@ msgid "" "[github]: https://github.com\n" "[github-flow]: https://guides.github.com/introduction/flow/\n" "[github-join]: https://github.com/join\n" -"[how-contribute]: https://egghead.io/series/how-to-contribute-to-an-open-source-project-on-github\n" +"[how-contribute]: https://egghead.io/series/how-to-contribute-to-an-open-" +"source-project-on-github\n" "[new-issue]: https://github.com/swcarpentry/git-novice/issues/new\n" "[issues]: https://github.com/swcarpentry/git-novice/issues/\n" "[repo]: https://github.com/swcarpentry/git-novice/\n" @@ -455,7 +477,8 @@ msgstr "" "[github]: https://github.com\n" "[github-flow]: https://guides.github.com/introduction/flow/\n" "[github-join]: https://github.com/join\n" -"[how-contribute]: https://egghead.io/series/how-to-contribute-to-an-open-source-project-on-github\n" +"[how-contribute]: https://egghead.io/series/how-to-contribute-to-an-open-" +"source-project-on-github\n" "[new-issue]: https://github.com/swcarpentry/git-novice/issues/new\n" "[issues]: https://github.com/swcarpentry/git-novice/issues/\n" "[repo]: https://github.com/swcarpentry/git-novice/\n" @@ -672,11 +695,17 @@ msgstr "" #: git-novice/README.md:1 msgid "" -"[![Create a Slack Account with us](https://img.shields.io/badge/Create_Slack_Account-The_Carpentries-071159.svg)](https://swc-slack-invite.herokuapp.com/) \n" -" [![Slack Status](https://img.shields.io/badge/Slack_Channel-swc--git-E01563.svg)](https://swcarpentry.slack.com/messages/C91JS49HD) " +"[![Create a Slack Account with us](https://img.shields.io/badge/" +"Create_Slack_Account-The_Carpentries-071159.svg)](https://swc-slack-invite." +"herokuapp.com/) \n" +" [![Slack Status](https://img.shields.io/badge/Slack_Channel-swc--git-E01563." +"svg)](https://swcarpentry.slack.com/messages/C91JS49HD) " msgstr "" -"[![Create a Slack Account with us](https://img.shields.io/badge/Create_Slack_Account-The_Carpentries-071159.svg)](https://swc-slack-invite.herokuapp.com/) \n" -" [![Slack Status](https://img.shields.io/badge/Slack_Channel-swc--git-E01563.svg)](https://swcarpentry.slack.com/messages/C91JS49HD) " +"[![Create a Slack Account with us](https://img.shields.io/badge/" +"Create_Slack_Account-The_Carpentries-071159.svg)](https://swc-slack-invite." +"herokuapp.com/) \n" +" [![Slack Status](https://img.shields.io/badge/Slack_Channel-swc--git-E01563." +"svg)](https://swcarpentry.slack.com/messages/C91JS49HD) " #: git-novice/README.md:4 msgid "" @@ -689,13 +718,15 @@ msgstr "" #: git-novice/README.md:7 msgid "" "An introduction to version control for novices using Git.\n" -"Please see for a rendered version of this material,\n" +"Please see for a rendered " +"version of this material,\n" "[the lesson template documentation][lesson-example]\n" "for instructions on formatting, building, and submitting material,\n" "or run `make` in this directory for a list of helpful commands." msgstr "" "これはGitを使用している初心者のためのバージョン管理の紹介です。\n" -"この資料のレンダリング版については、を参照してください。\n" +"この資料のレンダリング版については、を参照してください。\n" "[レッスンテンプレートのドキュメント] [lesson-example]\n" "書式設定、構築、および提出に関する指示については、\n" "有用なコマンドのリストについては、このディレクトリに `make`を実行してくださ" @@ -709,31 +740,36 @@ msgstr "メンテナー：" #: git-novice/README.md:15 msgid "* [Ivan Gonzalez][gonzalez_ivan]: [@iglpdc](https://github.com/iglpdc)" msgstr "" -"* [Tom Kelly][kelly_tom]: [@TomKellyGenetics](https://github.com/TomKellyGenetics)" +"* [Tom Kelly][kelly_tom]: [@TomKellyGenetics](https://github.com/" +"TomKellyGenetics)" # unordered list #: git-novice/README.md:16 msgid "* [Nima Hejazi][hejazi_nima]: [@nhejazi](https://github.com/nhejazi)" msgstr "" -"* [GivenName FamilyName][family_given]: [@GitHubUser](https://github.com/GitHubUser)" +"* [GivenName FamilyName][family_given]: [@GitHubUser](https://github.com/" +"GitHubUser)" # unordered list #: git-novice/README.md:17 msgid "* [Daisie Huang][huang_daisie]: [@daisieh](https://github.com/daisieh)" msgstr "" -"* [GivenName FamilyName][family_given]: [@GitHubUser](https://github.com/GitHubUser)" +"* [GivenName FamilyName][family_given]: [@GitHubUser](https://github.com/" +"GitHubUser)" # unordered list #: git-novice/README.md:18 msgid "* [Kat Koziar][koziar_kat]: [@kekoziar](https://github.com/kekoziar)" msgstr "" -"* [GivenName FamilyName][family_given]: [@GitHubUser](https://github.com/GitHubUser)" +"* [GivenName FamilyName][family_given]: [@GitHubUser](https://github.com/" +"GitHubUser)" # unordered list #: git-novice/README.md:19 msgid "* [Madicken Munk][munk_madicken]: [@munkm](https://github.com/munkm)" msgstr "" -"* [GivenName FamilyName][family_given]: [@GitHubUser](https://github.com/GitHubUser)" +"* [GivenName FamilyName][family_given]: [@GitHubUser](https://github.com/" +"GitHubUser)" #: git-novice/README.md:21 msgid "" @@ -796,9 +832,13 @@ msgstr "" #: git-novice/_episodes/01-basics.md:20 msgid "" -"[![Piled Higher and Deeper by Jorge Cham, http://www.phdcomics.com/comics/archive_print.php?comicid=1531](../fig/phd101212s.png)](http://www.phdcomics.com)" +"[![Piled Higher and Deeper by Jorge Cham, http://www.phdcomics.com/comics/" +"archive_print.php?comicid=1531](../fig/phd101212s.png)](http://www.phdcomics." +"com)" msgstr "" -"[![Piled Higher and Deeper by Jorge Cham, http://www.phdcomics.com/comics/archive_print.php?comicid=1531](../fig/phd101212s.png)](http://www.phdcomics.com)" +"[![Piled Higher and Deeper by Jorge Cham, http://www.phdcomics.com/comics/" +"archive_print.php?comicid=1531](../fig/phd101212s.png)](http://www.phdcomics." +"com)" #: git-novice/_episodes/01-basics.md:22 msgid "\"Piled Higher and Deeper\" by Jorge Cham, http://www.phdcomics.com" @@ -809,19 +849,25 @@ msgid "" "We've all been in this situation before: it seems ridiculous to have\n" "multiple nearly-identical versions of the same document. Some word\n" "processors let us deal with this a little better, such as Microsoft\n" -"Word's [Track Changes](https://support.office.com/en-us/article/Track-changes-in-Word-197ba630-0f5f-4a8e-9a77-3712475e806a), Google Docs' [version\n" -"history](https://support.google.com/docs/answer/190843?hl=en), or LibreOffice's [Recording and Displaying Changes](https://help.libreoffice.org/Common/Recording_and_Displaying_Changes)." +"Word's [Track Changes](https://support.office.com/en-us/article/Track-" +"changes-in-Word-197ba630-0f5f-4a8e-9a77-3712475e806a), Google " +"Docs' [version\n" +"history](https://support.google.com/docs/answer/190843?hl=en), or " +"LibreOffice's [Recording and Displaying Changes](https://help.libreoffice." +"org/Common/Recording_and_Displaying_Changes)." msgstr "" "皆さんもこんな経験をされたことがあるはずです。複数の、（それもほとんど\n" "内容が同じの）文書のコピーを保存しておくのは馬鹿げたことです。文書作成ソフトの中には、\n" -"例えばMicrosoft Wordの[変更履歴](https://support.office.com/en-us/article/Track-changes-in-Word-197ba630-0f5f-4a8e-9a77-3712475e806a)、Google Docsの[バージョン履歴](https://support.google.com/docs/answer/190843?hl=en)、LibreOfficeの[変更の記録・表示](https://help.libreoffice.org/Common/Recording_and_Displaying_Changes)、\n" +"例えばMicrosoft Wordの[変更履歴](https://support.office.com/en-us/article/Track-changes-in-Word-197ba630-0f5f-4a8e-9a77-3712475e806a)、Google Docsの[バージョン履歴]" +"(https://support.google.com/docs/answer/190843?hl=en)、LibreOfficeの[変更の記録・表示](https://help.libreoffice.org/Common/Recording_and_Displaying_Changes)、\n" "こういった状況にある程度うまく対応できるものもあります。" #: git-novice/_episodes/01-basics.md:30 msgid "" "Version control systems start with a base version of the document and\n" "then record changes you make each step of the way. You can\n" -"think of it as a recording of your progress: you can rewind to start at the base\n" +"think of it as a recording of your progress: you can rewind to start at the " +"base\n" "document and play back each change you made, eventually arriving at your\n" "more recent version." msgstr "" @@ -837,8 +883,10 @@ msgstr "![Changes Are Saved Sequentially](../fig/play-changes.svg)" #: git-novice/_episodes/01-basics.md:38 msgid "" "Once you think of changes as separate from the document itself, you\n" -"can then think about \"playing back\" different sets of changes on the base document, ultimately\n" -"resulting in different versions of that document. For example, two users can make independent\n" +"can then think about \"playing back\" different sets of changes on the base " +"document, ultimately\n" +"resulting in different versions of that document. For example, two users can " +"make independent\n" "sets of changes on the same document. " msgstr "" "「変更点」と「ドキュメント」を別々の物として考えてみると、基礎となるドキュメントに\n" @@ -862,7 +910,8 @@ msgstr "![Multiple Versions Can be Merged](../fig/merge.svg)" #: git-novice/_episodes/01-basics.md:49 msgid "" -"A version control system is a tool that keeps track of these changes for us,\n" +"A version control system is a tool that keeps track of these changes for " +"us,\n" "effectively creating different versions of our files. It allows us to\n" "decide which changes will be made to the next version (each record of these changes is called a\n" "[commit]({{ page.root }}/reference#commit)), and keeps useful metadata about them. The\n" @@ -888,11 +937,16 @@ msgstr "> ## バージョン管理システムの長い歴史" msgid "" ">\n" "> Automated version control systems are nothing new.\n" -"> Tools like RCS, CVS, or Subversion have been around since the early 1980s and are used by many large companies.\n" -"> However, many of these are now considered legacy systems (i.e., outdated) due to various limitations in their capabilities.\n" -"> More modern systems, such as Git and [Mercurial](https://swcarpentry.github.io/hg-novice/),\n" -"> are *distributed*, meaning that they do not need a centralized server to host the repository.\n" -"> These modern systems also include powerful merging tools that make it possible for multiple authors to work on\n" +"> Tools like RCS, CVS, or Subversion have been around since the early 1980s " +"and are used by many large companies.\n" +"> However, many of these are now considered legacy systems (i.e., outdated) " +"due to various limitations in their capabilities.\n" +"> More modern systems, such as Git and [Mercurial](https://swcarpentry." +"github.io/hg-novice/),\n" +"> are *distributed*, meaning that they do not need a centralized server to " +"host the repository.\n" +"> These modern systems also include powerful merging tools that make it " +"possible for multiple authors to work on\n" "> the same files concurrently." msgstr "" ">\n" @@ -935,11 +989,14 @@ msgstr "> ## 論文を書くにあたって" #: git-novice/_episodes/01-basics.md:69 msgid "" ">\n" -"> * Imagine you drafted an excellent paragraph for a paper you are writing, but later ruin it. How would you retrieve\n" +"> * Imagine you drafted an excellent paragraph for a paper you are " +"writing, but later ruin it. How would you retrieve\n" "> the *excellent* version of your conclusion? Is it even possible?\n" ">\n" -"> * Imagine you have 5 co-authors. How would you manage the changes and comments they make to your paper?\n" -"> If you use LibreOffice Writer or Microsoft Word, what happens if you accept changes made using the\n" +"> * Imagine you have 5 co-authors. How would you manage the changes and " +"comments they make to your paper?\n" +"> If you use LibreOffice Writer or Microsoft Word, what happens if you " +"accept changes made using the\n" "> `Track Changes` option? Do you have a history of those changes?" msgstr "" ">\n" @@ -993,7 +1050,8 @@ msgid "" "- \"Configure `git` the first time it is used on a computer.\"\n" "- \"Understand the meaning of the `--global` configuration flag.\"\n" "keypoints:\n" -"- \"Use `git config` with the `--global` option to configure a user name, email address, editor, and other preferences once per machine.\"\n" +"- \"Use `git config` with the `--global` option to configure a user name, " +"email address, editor, and other preferences once per machine.\"\n" "---" msgstr "" "---\n" @@ -1133,7 +1191,8 @@ msgstr "{: .language-bash}" #: git-novice/_episodes/02-setup.md:32 msgid "" -"Please use your own name and email address instead of Dracula's. This user name and email will be associated with your subsequent Git activity,\n" +"Please use your own name and email address instead of Dracula's. This user " +"name and email will be associated with your subsequent Git activity,\n" "which means that any changes pushed to\n" "[GitHub](https://github.com/),\n" "[BitBucket](https://bitbucket.org/),\n" @@ -1184,7 +1243,8 @@ msgid "" "> {: .language-bash}\n" "> \n" "> You can read more about this issue \n" -"> [on this GitHub page](https://help.github.com/articles/dealing-with-line-endings/)." +"> [on this GitHub page](https://help.github.com/articles/dealing-with-line-" +"endings/)." msgstr "" ">\n" "> 他のキーと同様に、Return キーを押すと、\n" @@ -1219,8 +1279,15 @@ msgstr "" #: git-novice/_episodes/02-setup.md:72 msgid "" -"For these lessons, we will be interacting with [GitHub](https://github.com/) and so the email address used should be the same as the one used when setting up your GitHub account. If you are concerned about privacy, please review [GitHub's instructions for keeping your email address private][git-privacy]. \n"" -"If you elect to use a private email address with GitHub, then use that same email address for the `user.email` value, e.g. `username@users.noreply.github.com` replacing `username` with your GitHub one. You can change the email address later on by using the `git config` command again." +"For these lessons, we will be interacting with [GitHub](https://github.com/) " +"and so the email address used should be the same as the one used when " +"setting up your GitHub account. If you are concerned about privacy, please " +"review [GitHub's instructions for keeping your email address private][git-" +"privacy]. \n"" +"If you elect to use a private email address with GitHub, then use that same " +"email address for the `user.email` value, e.g. `username@users.noreply." +"github.com` replacing `username` with your GitHub one. You can change the " +"email address later on by using the `git config` command again." msgstr "" "これらのレッスンでは、[GitHub](https://github.com/) に接続するので、GitHub アカウントと同じメールアドレスに設定してください。プライバシーについて気になる方は、[GitHub のメールアドレスをプライベートにするための説明][git-privacy] を参照してください。\n" "GitHub が提供するプライベートメールアドレスを使う場合は、同じメールアドレスを `user.email` の値に設定してください（例：`username@users.noreply.github.com`）。メールアドレスは `git config` コマンドでいつでも変えることができます。" @@ -1235,15 +1302,25 @@ msgid "" "|:-------------------|:-------------------------------------------------|\n" "| Atom | `$ git config --global core.editor \"atom --wait\"`|\n" "| nano | `$ git config --global core.editor \"nano -w\"` |\n" -"| BBEdit (Mac, with command line tools) | `$ git config --global core.editor \"bbedit -w\"` |\n" -"| Sublime Text (Mac) | `$ git config --global core.editor \"/Applications/Sublime\\ Text.app/Contents/SharedSupport/bin/subl -n -w\"` |\n" -"| Sublime Text (Win, 32-bit install) | `$ git config --global core.editor \"'c:/program files (x86)/sublime text 3/sublime_text.exe' -w\"` |\n" -"| Sublime Text (Win, 64-bit install) | `$ git config --global core.editor \"'c:/program files/sublime text 3/sublime_text.exe' -w\"` |\n" -"| Notepad++ (Win, 32-bit install) | `$ git config --global core.editor \"'c:/program files (x86)/Notepad++/notepad++.exe' -multiInst -notabbar -nosession -noPlugin\"`|\n" -"| Notepad++ (Win, 64-bit install) | `$ git config --global core.editor \"'c:/program files/Notepad++/notepad++.exe' -multiInst -notabbar -nosession -noPlugin\"`|\n" +"| BBEdit (Mac, with command line tools) | `$ git config --global core.editor " +"\"bbedit -w\"` |\n" +"| Sublime Text (Mac) | `$ git config --global core.editor \"/Applications/" +"Sublime\\ Text.app/Contents/SharedSupport/bin/subl -n -w\"` |\n" +"| Sublime Text (Win, 32-bit install) | `$ git config --global core.editor " +"\"'c:/program files (x86)/sublime text 3/sublime_text.exe' -w\"` |\n" +"| Sublime Text (Win, 64-bit install) | `$ git config --global core.editor " +"\"'c:/program files/sublime text 3/sublime_text.exe' -w\"` |\n" +"| Notepad++ (Win, 32-bit install) | `$ git config --global core.editor " +"\"'c:/program files (x86)/Notepad++/notepad++.exe' -multiInst -notabbar -" +"nosession -noPlugin\"`|\n" +"| Notepad++ (Win, 64-bit install) | `$ git config --global core.editor " +"\"'c:/program files/Notepad++/notepad++.exe' -multiInst -notabbar -nosession " +"-noPlugin\"`|\n" "| Kate (Linux) | `$ git config --global core.editor \"kate\"` |\n" -"| Gedit (Linux) | `$ git config --global core.editor \"gedit --wait --new-window\"` |\n" -"| Scratch (Linux) | `$ git config --global core.editor \"scratch-text-editor\"` |\n" +"| Gedit (Linux) | `$ git config --global core.editor \"gedit --wait --" +"new-window\"` |\n" +"| Scratch (Linux) | `$ git config --global core.editor \"scratch-text-" +"editor\"` |\n" "| Emacs | `$ git config --global core.editor \"emacs\"` |\n" "| Vim | `$ git config --global core.editor \"vim\"` |" msgstr "" @@ -1251,15 +1328,25 @@ msgstr "" "|:-------------------|:-------------------------------------------------|\n" "| Atom | `$ git config --global core.editor \"atom --wait\"`|\n" "| nano | `$ git config --global core.editor \"nano -w\"` |\n" -"| BBEdit (Mac, with command line tools) | `$ git config --global core.editor \"bbedit -w\"` |\n" -"| Sublime Text (Mac) | `$ git config --global core.editor \"/Applications/Sublime\\ Text.app/Contents/SharedSupport/bin/subl -n -w\"` |\n" -"| Sublime Text (Win, 32-bit install) | `$ git config --global core.editor \"'c:/program files (x86)/sublime text 3/sublime_text.exe' -w\"` |\n" -"| Sublime Text (Win, 64-bit install) | `$ git config --global core.editor \"'c:/program files/sublime text 3/sublime_text.exe' -w\"` |\n" -"| Notepad++ (Win, 32-bit install) | `$ git config --global core.editor \"'c:/program files (x86)/Notepad++/notepad++.exe' -multiInst -notabbar -nosession -noPlugin\"`|\n" -"| Notepad++ (Win, 64-bit install) | `$ git config --global core.editor \"'c:/program files/Notepad++/notepad++.exe' -multiInst -notabbar -nosession -noPlugin\"`|\n" +"| BBEdit (Mac, with command line tools) | `$ git config --global core.editor " +"\"bbedit -w\"` |\n" +"| Sublime Text (Mac) | `$ git config --global core.editor \"/Applications/" +"Sublime\\ Text.app/Contents/SharedSupport/bin/subl -n -w\"` |\n" +"| Sublime Text (Win, 32-bit install) | `$ git config --global core.editor " +"\"'c:/program files (x86)/sublime text 3/sublime_text.exe' -w\"` |\n" +"| Sublime Text (Win, 64-bit install) | `$ git config --global core.editor " +"\"'c:/program files/sublime text 3/sublime_text.exe' -w\"` |\n" +"| Notepad++ (Win, 32-bit install) | `$ git config --global core.editor " +"\"'c:/program files (x86)/Notepad++/notepad++.exe' -multiInst -notabbar -" +"nosession -noPlugin\"`|\n" +"| Notepad++ (Win, 64-bit install) | `$ git config --global core.editor " +"\"'c:/program files/Notepad++/notepad++.exe' -multiInst -notabbar -nosession " +"-noPlugin\"`|\n" "| Kate (Linux) | `$ git config --global core.editor \"kate\"` |\n" -"| Gedit (Linux) | `$ git config --global core.editor \"gedit --wait --new-window\"` |\n" -"| Scratch (Linux) | `$ git config --global core.editor \"scratch-text-editor\"` |\n" +"| Gedit (Linux) | `$ git config --global core.editor \"gedit --wait --" +"new-window\"` |\n" +"| Scratch (Linux) | `$ git config --global core.editor \"scratch-text-" +"editor\"` |\n" "| Emacs | `$ git config --global core.editor \"emacs\"` |\n" "| Vim | `$ git config --global core.editor \"vim\"` |" @@ -1275,9 +1362,12 @@ msgstr "> ## Vim の終了の仕方" #: git-novice/_episodes/02-setup.md:96 msgid "" ">\n" -"> Note that Vim is the default editor for many programs. If you haven't used Vim before and wish to exit a session without saving\n" -"your changes, press Esc then type `:q!` and hit Return.\n" -"> If you want to save your changes and quit, press Esc then type `:wq` and hit Return." +"> Note that Vim is the default editor for many programs. If you haven't used " +"Vim before and wish to exit a session without saving\n" +"your changes, press Esc then type `:q!` and hit Return.\n" +"> If you want to save your changes and quit, press Esc then type " +"`:wq` and hit Return." msgstr "" ">\n" "> 多くのソフトの初期設定では、Vim がデフォルトのテキストエディタに設定されています。保存せずに Vim を終了するには、\n" @@ -1286,8 +1376,10 @@ msgstr "" #: git-novice/_episodes/02-setup.md:102 msgid "" -"The four commands we just ran above only need to be run once: the flag `--global` tells Git\n" -"to use the settings for every project, in your user account, on this computer." +"The four commands we just ran above only need to be run once: the flag `--" +"global` tells Git\n" +"to use the settings for every project, in your user account, on this " +"computer." msgstr "" "上記の4つのコマンドは、一度実行するだけで十分です。`--global` フラグは Git に、\n" "今使っているパソコン内にある自分のアカウントに関連する全てのプロジェクトに同じ設定をするように指示しています。" @@ -1324,7 +1416,8 @@ msgstr "> ## プロキシ" msgid "" ">\n" "> In some networks you need to use a\n" -"> [proxy](https://en.wikipedia.org/wiki/Proxy_server). If this is the case, you\n" +"> [proxy](https://en.wikipedia.org/wiki/Proxy_server). If this is the case, " +"you\n" "> may also need to tell Git about the proxy:\n" ">\n" "> ~~~\n" @@ -1368,7 +1461,9 @@ msgstr "> ## Git のヘルプとマニュアル" #: git-novice/_episodes/02-setup.md:137 msgid "" ">\n" -"> Always remember that if you forget a `git` command, you can access the list of commands by using `-h` and access the Git manual by using `--help` :\n" +"> Always remember that if you forget a `git` command, you can access the " +"list of commands by using `-h` and access the Git manual by using `--" +"help` :\n" ">\n" "> ~~~\n" "> $ git config -h\n" @@ -1387,9 +1482,11 @@ msgstr "" #: git-novice/_episodes/02-setup.md:147 msgid "" -"[git-privacy]: https://help.github.com/articles/keeping-your-email-address-private/" +"[git-privacy]: https://help.github.com/articles/keeping-your-email-address-" +"private/" msgstr "" -"[git-privacy]: https://help.github.com/articles/keeping-your-email-address-private/" +"[git-privacy]: https://help.github.com/articles/keeping-your-email-address-" +"private/" # Front Matter #: git-novice/_episodes/03-create.md:1 @@ -1430,7 +1527,8 @@ msgstr "" #: git-novice/_episodes/03-create.md:17 msgid "" -"First, let's create a directory in `Desktop` folder for our work and then move into that directory:" +"First, let's create a directory in `Desktop` folder for our work and then " +"move into that directory:" msgstr "" "まず、`Desktop`フォルダーに作業用のディレクトリを作成し、" "そのディレクトリに移動しましょう:" @@ -1452,10 +1550,12 @@ msgstr "" #: git-novice/_episodes/03-create.md:26 msgid "" -"Then we tell Git to make `planets` a [repository]({{ page.root }}/reference#repository)—a place where\n" +"Then we tell Git to make `planets` a [repository]({{ page.root }}/" +"reference#repository)—a place where\n" "Git can store versions of our files:" msgstr "" -"次に、Gitに`planets`を[リポジトリ]({{ page.root }}/reference#repository)—\n" +"次に、Gitに`planets`を[リポジトリ]({{ page.root }}/" +"reference#repository)—\n" "（Gitがファイルのバージョンを保存できる場所）にするように伝えます。" # code block @@ -1491,10 +1591,12 @@ msgstr "" #: git-novice/_episodes/03-create.md:42 msgid "" "But if we add the `-a` flag to show everything,\n" -"we can see that Git has created a hidden directory within `planets` called `.git`:" +"we can see that Git has created a hidden directory within `planets` called `." +"git`:" msgstr "" "ですが `-a` フラグを追加してすべてを表示すると、\n" -"Git が `.git`という隠しディレクトリを `planets` の中に作ったことがわかります: " +"Git が `." +"git`という隠しディレクトリを `planets` の中に作ったことがわかります: " # code block #: git-novice/_episodes/03-create.md:45 @@ -1577,13 +1679,16 @@ msgstr "{: .output}" #: git-novice/_episodes/03-create.md:55 msgid "" -"Git uses this special sub-directory to store all the information about the project, \n" -"including all files and sub-directories located within the project's directory.\n" +"Git uses this special sub-directory to store all the information about the " +"project, \n" +"including all files and sub-directories located within the project's " +"directory.\n" "If we ever delete the `.git` sub-directory,\n" "we will lose the project's history." msgstr "" "Git はプロジェクトのディレクトリ内にあるすべてのファイルとサブディレクトリを含む、" -"プロジェクトに関するすべての情報を格納するためにこの特別なサブディレクトリを 使用します。\n" +"プロジェクトに関するすべての情報を格納するためにこの特別なサブディレクトリを " +"使用します。\n" "`.git` サブディレクトリを削除すると、\n" "プロジェクトの履歴を失うことになります。" @@ -1648,39 +1753,53 @@ msgstr "> ## Git リポジトリを作る場所" #: git-novice/_episodes/03-create.md:81 msgid "" ">\n" -"> Along with tracking information about planets (the project we have already created), \n" +"> Along with tracking information about planets (the project we have already " +"created), \n" "> Dracula would also like to track information about moons.\n" -"> Despite Wolfman's concerns, Dracula creates a `moons` project inside his `planets` \n" +"> Despite Wolfman's concerns, Dracula creates a `moons` project inside his " +"`planets` \n" "> project with the following sequence of commands:\n" ">\n" "> ~~~\n" "> $ cd ~/Desktop # return to Desktop directory\n" -"> $ cd planets # go into planets directory, which is already a Git repository\n" -"> $ ls -a # ensure the .git sub-directory is still present in the planets directory\n" +"> $ cd planets # go into planets directory, which is already a Git " +"repository\n" +"> $ ls -a # ensure the .git sub-directory is still present in the " +"planets directory\n" "> $ mkdir moons # make a sub-directory planets/moons\n" "> $ cd moons # go into moons sub-directory\n" "> $ git init # make the moons sub-directory a Git repository\n" -"> $ ls -a # ensure the .git sub-directory is present indicating we have created a new Git repository\n" +"> $ ls -a # ensure the .git sub-directory is present indicating we " +"have created a new Git repository\n" "> ~~~\n" "> {: .language-bash}\n" ">\n" -"> Is the `git init` command, run inside the `moons` sub-directory, required for \n" +"> Is the `git init` command, run inside the `moons` sub-directory, required " +"for \n" "> tracking files stored in the `moons` sub-directory?\n" "> \n" "> > ## Solution\n" "> >\n" -"> > No. Dracula does not need to make the `moons` sub-directory a Git repository \n" -"> > because the `planets` repository will track all files, sub-directories, and \n" -"> > sub-directory files under the `planets` directory. Thus, in order to track \n" -"> > all information about moons, Dracula only needed to add the `moons` sub-directory\n" +"> > No. Dracula does not need to make the `moons` sub-directory a Git " +"repository \n" +"> > because the `planets` repository will track all files, sub-directories, " +"and \n" +"> > sub-directory files under the `planets` directory. Thus, in order to " +"track \n" +"> > all information about moons, Dracula only needed to add the `moons` sub-" +"directory\n" "> > to the `planets` directory.\n" "> > \n" -"> > Additionally, Git repositories can interfere with each other if they are \"nested\":\n" +"> > Additionally, Git repositories can interfere with each other if they are " +"\"nested\":\n" "> > the outer repository will try to version-control\n" "> > the inner repository. Therefore, it's best to create each new Git\n" -"> > repository in a separate directory. To be sure that there is no conflicting\n" -"> > repository in the directory, check the output of `git status`. If it looks\n" -"> > like the following, you are good to go to create a new repository as shown\n" +"> > repository in a separate directory. To be sure that there is no " +"conflicting\n" +"> > repository in the directory, check the output of `git status`. If it " +"looks\n" +"> > like the following, you are good to go to create a new repository as " +"shown\n" "> > above:\n" "> >\n" "> > ~~~\n" @@ -1694,7 +1813,8 @@ msgid "" "> > {: .output}" msgstr "" ">\n" -"> planets (すでに作成したプロジェクト) についての情報を追跡すると共に、 \n" +"> planets (すでに作成したプロジェクト) " +"についての情報を追跡すると共に、 \n" "> ドラキュラは moons についての情報も追跡したいと考えています。\n" "> 狼男の心配にもかかわらず、ドラキュラは次の一連のコマンドを使って、" "彼の `planets` \n" @@ -1771,16 +1891,20 @@ msgstr "> ## Correcting `git init` Mistakes" # blockquote, which can be cascaded #: git-novice/_episodes/03-create.md:130 msgid "" -"> Wolfman explains to Dracula how a nested repository is redundant and may cause confusion" +"> Wolfman explains to Dracula how a nested repository is redundant and may " +"cause confusion" msgstr "" -"> ドラえもん explains to のび太 how a nested repository is redundant and may cause confusion" +"> ドラえもん explains to のび太 how a nested repository is redundant and may " +"cause confusion" # blockquote, which can be cascaded #: git-novice/_episodes/03-create.md:131 msgid "" -"> down the road. Dracula would like to remove the nested repository. How can Dracula undo " +"> down the road. Dracula would like to remove the nested repository. How can " +"Dracula undo " msgstr "" -"> down the road. のび太 would like to remove the nested repository. How can のび太 undo " +"> down the road. のび太 would like to remove the nested repository. How can " +"のび太 undo " # blockquote, which can be cascaded #: git-novice/_episodes/03-create.md:132 @@ -1793,30 +1917,36 @@ msgid "" "> > ## Solution -- USE WITH CAUTION!\n" "> >\n" "> > To recover from this little mistake, Dracula can just remove the `.git`\n" -"> > folder in the moons subdirectory by running the following command from inside the `planets` directory:\n" +"> > folder in the moons subdirectory by running the following command from " +"inside the `planets` directory:\n" "> >\n" "> > ~~~\n" "> > $ rm -rf moons/.git\n" "> > ~~~\n" "> > {: .language-bash}\n" "> >\n" -"> > But be careful! Running this command in the wrong directory, will remove\n" -"> > the entire Git history of a project you might want to keep. Therefore, always check your current directory using the\n" +"> > But be careful! Running this command in the wrong directory, will " +"remove\n" +"> > the entire Git history of a project you might want to keep. Therefore, " +"always check your current directory using the\n" "> > command `pwd`." msgstr "" ">\n" "> > ## Solution -- USE WITH CAUTION!\n" "> >\n" "> > To recover from this little mistake, のび太 can just remove the `.git`\n" -"> > folder in the moons subdirectory by running the following command from inside the `planets` directory:\n" +"> > folder in the moons subdirectory by running the following command from " +"inside the `planets` directory:\n" "> >\n" "> > ~~~\n" "> > $ rm -rf moons/.git\n" "> > ~~~\n" "> > {: .language-bash}\n" "> >\n" -"> > But be careful! Running this command in the wrong directory, will remove\n" -"> > the entire Git history of a project you might want to keep. Therefore, always check your current directory using the\n" +"> > But be careful! Running this command in the wrong directory, will " +"remove\n" +"> > the entire Git history of a project you might want to keep. Therefore, " +"always check your current directory using the\n" "> > command `pwd`." # Front Matter @@ -1836,9 +1966,12 @@ msgid "" "- \"Distinguish between descriptive and non-descriptive commit messages.\"\n" "keypoints:\n" "- \"`git status` shows the status of a repository.\"\n" -"- \"Files can be stored in a project's working directory (which users see), the staging area (where the next commit is being built up) and the local repository (where commits are permanently recorded).\"\n" +"- \"Files can be stored in a project's working directory (which users see), " +"the staging area (where the next commit is being built up) and the local " +"repository (where commits are permanently recorded).\"\n" "- \"`git add` puts files in the staging area.\"\n" -"- \"`git commit` saves the staged content as a new commit in the local repository.\"\n" +"- \"`git commit` saves the staged content as a new commit in the local " +"repository.\"\n" "- \"Write a commit message that accurately describes your changes.\"\n" "---" msgstr "" @@ -1905,9 +2038,13 @@ msgid "" "about the Red Planet's suitability as a base.\n" "We'll use `nano` to edit the file;\n" "you can use whatever editor you like.\n" -"In particular, this does not have to be the `core.editor` you set globally earlier. \n" -"But remember, the.language-bash command to create or edit a new file will depend on the editor you choose (it might not be `nano`). \n" -"For a refresher on text editors, check out [\"Which Editor?\"](https://swcarpentry.github.io/shell-novice/03-create/) in [The Unix Shell](https://swcarpentry.github.io/shell-novice/) lesson." +"In particular, this does not have to be the `core.editor` you set globally " +"earlier. \n" +"But remember, the.language-bash command to create or edit a new file will " +"depend on the editor you choose (it might not be `nano`). \n" +"For a refresher on text editors, check out [\"Which Editor?\"](https://" +"swcarpentry.github.io/shell-novice/03-create/) in [The Unix Shell](https://" +"swcarpentry.github.io/shell-novice/) lesson." msgstr "" "赤い惑星（火星）が基地に最適かどうかについてのノートを書くために\n" " `mars.txt` というファイルを作成しましょう。\n" @@ -1917,7 +2054,9 @@ msgstr "" "大丈夫です。\n" "ですが、新しくファイルを作成・編集するコマンドはエディタによって" "違うということを覚えておいてください（`nano` ではないかもしれません）。\n" -"テキストエディタについて復習したい方は、[Unix シェル](https://swcarpentry.github.io/shell-novice/) の [\"どのエディタ？\"](https://swcarpentry.github.io/shell-novice/03-create/) のレッスンを見てみてください。" +"テキストエディタについて復習したい方は、[Unix シェル]" +"(https://swcarpentry.github.io/shell-novice/) の [\"どのエディタ？\"](https://" +"swcarpentry.github.io/shell-novice/03-create/) のレッスンを見てみてください。" # code block #: git-novice/_episodes/04-changes.md:44 @@ -1996,7 +2135,8 @@ msgid "" " (use \"git add ...\" to include in what will be committed)\n" "\n" "\tmars.txt\n" -"nothing added to commit but untracked files present (use \"git add\" to track)\n" +"nothing added to commit but untracked files present (use \"git add\" to " +"track)\n" "~~~" msgstr "" "~~~\n" @@ -2008,7 +2148,8 @@ msgstr "" " (use \"git add ...\" to include in what will be committed)\n" "\n" "\tmars.txt\n" -"nothing added to commit but untracked files present (use \"git add\" to track)\n" +"nothing added to commit but untracked files present (use \"git add\" to " +"track)\n" "~~~" #: git-novice/_episodes/04-changes.md:98 @@ -2107,7 +2248,8 @@ msgid "" "Git takes everything we have told it to save by using `git add`\n" "and stores a copy permanently inside the special `.git` directory.\n" "This permanent copy is called a [commit]({{ page.root }}/reference#commit)\n" -"(or [revision]({{ page.root }}/reference#revision)) and its short identifier is `f22b25e`.\n" +"(or [revision]({{ page.root }}/reference#revision)) and its short identifier " +"is `f22b25e`.\n" "Your commit may have another identifier." msgstr "" "`git commit` を使うと、\n" @@ -2121,9 +2263,11 @@ msgstr "" #: git-novice/_episodes/04-changes.md:151 msgid "" "We use the `-m` flag (for \"message\")\n" -"to record a short, descriptive, and specific comment that will help us remember later on what we did and why.\n" +"to record a short, descriptive, and specific comment that will help us " +"remember later on what we did and why.\n" "If we just run `git commit` without the `-m` option,\n" -"Git will launch `nano` (or whatever other editor we configured as `core.editor`)\n" +"Git will launch `nano` (or whatever other editor we configured as `core." +"editor`)\n" "so that we can write a longer message." msgstr "" "`-m` フラグ（「メッセージ」の略）を使い、\n" @@ -2136,9 +2280,13 @@ msgstr "" #: git-novice/_episodes/04-changes.md:157 msgid "" -"[Good commit messages][commit-messages] start with a brief (<50 characters) statement about the\n" -"changes made in the commit. Generally, the message should complete the sentence \"If applied, this commit will\" .\n" -"If you want to go into more detail, add a blank line between the summary line and your additional notes. Use this additional space to explain why you made changes and/or what their impact will be." +"[Good commit messages][commit-messages] start with a brief (<50 characters) " +"statement about the\n" +"changes made in the commit. Generally, the message should complete the " +"sentence \"If applied, this commit will\" .\n" +"If you want to go into more detail, add a blank line between the summary " +"line and your additional notes. Use this additional space to explain why you " +"made changes and/or what their impact will be." msgstr "" "[良いコミットメッセージ][commit-messages] は、どのような変更が" "行われたのかが分かる短い文（50字以下）\n" @@ -2209,7 +2357,8 @@ msgstr "" #: git-novice/_episodes/04-changes.md:192 msgid "" -"`git log` lists all commits made to a repository in reverse chronological order.\n" +"`git log` lists all commits made to a repository in reverse chronological " +"order.\n" "The listing for each commit includes\n" "the commit's full identifier\n" "(which starts with the same characters as\n" @@ -2236,7 +2385,8 @@ msgstr "> ## 変更点は何処にあるの？" #: git-novice/_episodes/04-changes.md:202 msgid "" ">\n" -"> If we run `ls` at this point, we will still see just one file called `mars.txt`.\n" +"> If we run `ls` at this point, we will still see just one file called `mars." +"txt`.\n" "> That's because Git saves information about files' history\n" "> in the special `.git` directory mentioned earlier\n" "> so that our filesystem doesn't become cluttered\n" @@ -2253,7 +2403,8 @@ msgstr "" #: git-novice/_episodes/04-changes.md:210 msgid "" "Now suppose Dracula adds more information to the file.\n" -"(Again, we'll edit with `nano` and then `cat` the file to show its contents;\n" +"(Again, we'll edit with `nano` and then `cat` the file to show its " +"contents;\n" "you may use a different editor, and don't need to `cat`.)" msgstr "" "それでは、ドラキュラがファイルに新しい情報を加えたとしましょう。\n" @@ -2308,7 +2459,8 @@ msgid "" "On branch master\n" "Changes not staged for commit:\n" " (use \"git add ...\" to update what will be committed)\n" -" (use \"git checkout -- ...\" to discard changes in working directory)\n" +" (use \"git checkout -- ...\" to discard changes in working " +"directory)\n" "\n" "\tmodified: mars.txt\n" "\n" @@ -2319,7 +2471,8 @@ msgstr "" "On branch master\n" "Changes not staged for commit:\n" " (use \"git add ...\" to update what will be committed)\n" -" (use \"git checkout -- ...\" to discard changes in working directory)\n" +" (use \"git checkout -- ...\" to discard changes in working " +"directory)\n" "\n" "\tmodified: mars.txt\n" "\n" @@ -2400,18 +2553,23 @@ msgstr "" # ordered list #: git-novice/_episodes/04-changes.md:278 msgid "" -"1. The first line tells us that Git is producing output similar to the Unix `diff` command" +"1. The first line tells us that Git is producing output similar to the Unix " +"`diff` command" msgstr "" -"1. 最初の文は、Git が古いバージョンと新しいバージョンのファイルをUnix の `diff` " +"1. 最初の文は、Git が古いバージョンと新しいバージョンのファイルをUnix の " +"`diff` " #: git-novice/_episodes/04-changes.md:279 msgid "" " comparing the old and new versions of the file.\n" "2. The second line tells exactly which versions of the file\n" " Git is comparing;\n" -" `df0654a` and `315bf3a` are unique computer-generated labels for those versions.\n" -"3. The third and fourth lines once again show the name of the file being changed.\n" -"4. The remaining lines are the most interesting, they show us the actual differences\n" +" `df0654a` and `315bf3a` are unique computer-generated labels for those " +"versions.\n" +"3. The third and fourth lines once again show the name of the file being " +"changed.\n" +"4. The remaining lines are the most interesting, they show us the actual " +"differences\n" " and the lines on which they occur.\n" " In particular,\n" " the `+` marker in the first column shows where we added a line." @@ -2528,7 +2686,8 @@ msgstr "> ## ステージングエリア" #: git-novice/_episodes/04-changes.md:343 msgid "" ">\n" -"> If you think of Git as taking snapshots of changes over the life of a project,\n" +"> If you think of Git as taking snapshots of changes over the life of a " +"project,\n" "> `git add` specifies *what* will go in a snapshot\n" "> (putting things in the staging area),\n" "> and `git commit` then *actually takes* the snapshot, and\n" @@ -2826,9 +2985,12 @@ msgstr "> ## ログの出力を制限する" #: git-novice/_episodes/04-changes.md:517 msgid "" ">\n" -"> To avoid having `git log` cover your entire terminal screen, you can limit the\n" -"> number of commits that Git lists by using `-N`, where `N` is the number of\n" -"> commits that you want to view. For example, if you only want information from\n" +"> To avoid having `git log` cover your entire terminal screen, you can limit " +"the\n" +"> number of commits that Git lists by using `-N`, where `N` is the number " +"of\n" +"> commits that you want to view. For example, if you only want information " +"from\n" "> the last commit you can use:\n" ">\n" "> ~~~\n" @@ -2847,7 +3009,8 @@ msgstr "" ">\n" "> `git log` の出力がスクリーン全体を埋めないようにするために、Git" "が\n" -"> 表示するコミットの数を `-N` で変えることができます。この `N` は、\n" +"> 表示するコミットの数を `-N` で変えることができます。この `N` " +"は、\n" "> 表示したいコミットの数を表しています。例えば、最新のコミットの情報" "だけを\n" "> 表示したい場合は、こう入力します：\n" @@ -2958,14 +3121,19 @@ msgid "" "> {: .language-bash}\n" ">\n" "> Note, our newly created empty directory `directory` does not appear in\n" -"> the list of untracked files even if we explicitly add it (_via_ `git add`) to our\n" -"> repository. This is the reason why you will sometimes see `.gitkeep` files\n" -"> in otherwise empty directories. Unlike `.gitignore`, these files are not special\n" -"> and their sole purpose is to populate a directory so that Git adds it to\n" +"> the list of untracked files even if we explicitly add it (_via_ `git " +"add`) to our\n" +"> repository. This is the reason why you will sometimes see `.gitkeep` " +"files\n" +"> in otherwise empty directories. Unlike `.gitignore`, these files are " +"not special\n" +"> and their sole purpose is to populate a directory so that Git adds it " +"to\n" "> the repository. In fact, you can name such files anything you like.\n" ">\n" "> {:start=\"2\"}\n" -"> 2. If you create a directory in your Git repository and populate it with files,\n" +"> 2. If you create a directory in your Git repository and populate it with " +"files,\n" "> you can add all files in the directory at once by:\n" ">\n" "> ~~~\n" @@ -3036,12 +3204,15 @@ msgid "" "> last commit made to `mars.txt`?\n" ">\n" "> 1. \"Changes\"\n" -"> 2. \"Added line 'But the Mummy will appreciate the lack of humidity' to mars.txt\"\n" +"> 2. \"Added line 'But the Mummy will appreciate the lack of humidity' to " +"mars.txt\"\n" "> 3. \"Discuss effects of Mars' climate on the Mummy\"\n" ">\n" "> > ## Solution\n" -"> > Answer 1 is not descriptive enough, and the purpose of the commit is unclear;\n" -"> > and answer 2 is redundant to using \"git diff\" to see what changed in this commit;\n" +"> > Answer 1 is not descriptive enough, and the purpose of the commit is " +"unclear;\n" +"> > and answer 2 is redundant to using \"git diff\" to see what changed in " +"this commit;\n" "> > but answer 3 is good: short, descriptive, and imperative." msgstr "" ">\n" @@ -3049,7 +3220,8 @@ msgstr "" "> 最適なメッセージはどれでしょう？\n" ">\n" "> 1. \"Changes\"\n" -"> 2. \"Added line 'But the Mummy will appreciate the lack of humidity' to mars.txt\"\n" +"> 2. \"Added line 'But the Mummy will appreciate the lack of humidity' to " +"mars.txt\"\n" "> 3. \"Discuss effects of Mars' climate on the Mummy\"\n" ">\n" "> > ## Solution\n" @@ -3085,7 +3257,8 @@ msgid "" "> > 1. Would only create a commit if files have already been staged.\n" "> > 2. Would try to create a new repository.\n" "> > 3. Is correct: first add the file to the staging area, then commit.\n" -"> > 4. Would try to commit a file \"my recent changes\" with the message myfile.txt." +"> > 4. Would try to commit a file \"my recent changes\" with the message " +"myfile.txt." msgstr "" ">\n" "> 以下の内、`myfile.txt` を Git リポジトリに保存するための\n" @@ -3148,7 +3321,8 @@ msgid "" "> > Venus is a nice planet and I definitely should consider it as a base.\n" "> > ~~~\n" "> > {: .output}\n" -"> > Now you can add both files to the staging area. We can do that in one line:\n" +"> > Now you can add both files to the staging area. We can do that in one " +"line:\n" "> >\n" "> > ~~~\n" "> > $ git add mars.txt venus.txt\n" @@ -3160,7 +3334,8 @@ msgid "" "> > $ git add venus.txt\n" "> > ~~~\n" "> > {: .language-bash}\n" -"> > Now the files are ready to commit. You can check that using `git status`. If you are ready to commit use:\n" +"> > Now the files are ready to commit. You can check that using `git " +"status`. If you are ready to commit use:\n" "> > ~~~\n" "> > $ git commit -m \"Write plans to start a base on Venus\"\n" "> > ~~~\n" @@ -3271,7 +3446,8 @@ msgid "" "> > ~~~\n" "> > {: .language-bash}\n" "> >\n" -"> > Create your biography file `me.txt` using `nano` or another text editor.\n" +"> > Create your biography file `me.txt` using `nano` or another text " +"editor.\n" "> > Once in place, add and commit it to the repository:\n" "> >\n" "> > ~~~\n" @@ -3376,7 +3552,8 @@ msgid "" "> >\n" "> > ~~~\n" "> > $ git add me.txt\n" -"> > $ git commit -m \"Update Vlad's bio.\" --author=\"Frank N. Stein \"\n" +"> > $ git commit -m \"Update Vlad's bio.\" --author=\"Frank N. Stein " +"\"\n" "> > ~~~\n" "> > {: .language-bash}\n" "> >\n" @@ -3434,7 +3611,8 @@ msgstr "" "> >\n" "> > ~~~\n" "> > $ git add me.txt\n" -"> > $ git commit -m \"Update Vlad's bio.\" --author=\"Frank N. Stein \"\n" +"> > $ git commit -m \"Update Vlad's bio.\" --author=\"Frank N. Stein " +"\"\n" "> > ~~~\n" "> > {: .language-bash}\n" "> >\n" @@ -3520,11 +3698,13 @@ msgstr "" #: git-novice/_episodes/05-history.md:23 msgid "" -"We've been adding one line at a time to `mars.txt`, so it's easy to track our\n" +"We've been adding one line at a time to `mars.txt`, so it's easy to track " +"our\n" "progress by looking, so let's do that using our `HEAD`s. Before we start,\n" "let's make a change to `mars.txt`." msgstr "" -"We've been adding one line at a time to `mars.txt`, so it's easy to track our\n" +"We've been adding one line at a time to `mars.txt`, so it's easy to track " +"our\n" "progress by looking, so let's do that using our `HEAD`s. Before we start,\n" "let's make a change to `mars.txt`." @@ -3570,13 +3750,15 @@ msgstr "" #: git-novice/_episodes/05-history.md:59 msgid "" -"which is the same as what you would get if you leave out `HEAD` (try it). The\n" +"which is the same as what you would get if you leave out `HEAD` (try it). " +"The\n" "real goodness in all this is when you can refer to previous commits. We do\n" "that by adding `~1` \n" "(where \"~\" is \"tilde\", pronounced [**til**-d*uh*]) \n" "to refer to the commit one before `HEAD`." msgstr "" -"which is the same as what you would get if you leave out `HEAD` (try it). The\n" +"which is the same as what you would get if you leave out `HEAD` (try it). " +"The\n" "real goodness in all this is when you can refer to previous commits. We do\n" "that by adding `~1` \n" "(where \"~\" is \"tilde\", pronounced [**til**-d*uh*]) \n" @@ -3595,10 +3777,12 @@ msgstr "" #: git-novice/_episodes/05-history.md:70 msgid "" -"If we want to see the differences between older commits we can use `git diff`\n" +"If we want to see the differences between older commits we can use `git " +"diff`\n" "again, but with the notation `HEAD~1`, `HEAD~2`, and so on, to refer to them:" msgstr "" -"If we want to see the differences between older commits we can use `git diff`\n" +"If we want to see the differences between older commits we can use `git " +"diff`\n" "again, but with the notation `HEAD~1`, `HEAD~2`, and so on, to refer to them:" # code block @@ -3639,9 +3823,13 @@ msgstr "" #: git-novice/_episodes/05-history.md:91 msgid "" -"We could also use `git show` which shows us what changes we made at an older commit as well as the commit message, rather than the _differences_ between a commit and our working directory that we see by using `git diff`." +"We could also use `git show` which shows us what changes we made at an older " +"commit as well as the commit message, rather than the _differences_ between " +"a commit and our working directory that we see by using `git diff`." msgstr "" -"We could also use `git show` which shows us what changes we made at an older commit as well as the commit message, rather than the _differences_ between a commit and our working directory that we see by using `git diff`." +"We could also use `git show` which shows us what changes we made at an older " +"commit as well as the commit message, rather than the _differences_ between " +"a commit and our working directory that we see by using `git diff`." # code block #: git-novice/_episodes/05-history.md:93 @@ -3846,7 +4034,8 @@ msgid "" "As you might guess from its name,\n" "`git checkout` checks out (i.e., restores) an old version of a file.\n" "In this case,\n" -"we're telling Git that we want to recover the version of the file recorded in `HEAD`,\n" +"we're telling Git that we want to recover the version of the file recorded " +"in `HEAD`,\n" "which is the last saved commit.\n" "If we want to go back even further,\n" "we can use a commit identifier instead:" @@ -3854,7 +4043,8 @@ msgstr "" "As you might guess from its name,\n" "`git checkout` checks out (i.e., restores) an old version of a file.\n" "In this case,\n" -"we're telling Git that we want to recover the version of the file recorded in `HEAD`,\n" +"we're telling Git that we want to recover the version of the file recorded " +"in `HEAD`,\n" "which is the last saved commit.\n" "If we want to go back even further,\n" "we can use a commit identifier instead:" @@ -3879,7 +4069,8 @@ msgid "" " (use \"git reset HEAD ...\" to unstage)\n" "# Changes not staged for commit:\n" "# (use \"git add ...\" to update what will be committed)\n" -"# (use \"git checkout -- ...\" to discard changes in working directory)\n" +"# (use \"git checkout -- ...\" to discard changes in working " +"directory)\n" "#\n" "#\tmodified: mars.txt\n" "#\n" @@ -3892,7 +4083,8 @@ msgstr "" " (use \"git reset HEAD ...\" to unstage)\n" "# Changes not staged for commit:\n" "# (use \"git add ...\" to update what will be committed)\n" -"# (use \"git checkout -- ...\" to discard changes in working directory)\n" +"# (use \"git checkout -- ...\" to discard changes in working " +"directory)\n" "#\n" "#\tmodified: mars.txt\n" "#\n" @@ -3935,13 +4127,16 @@ msgid "" "> ~~~\n" "> {: .language-bash}\n" ">\n" -"> to revert `mars.txt` to its state after the commit `f22b25e`. But be careful! \n" -"> The command `checkout` has other important functionalities and Git will misunderstand\n" +"> to revert `mars.txt` to its state after the commit `f22b25e`. But be " +"careful! \n" +"> The command `checkout` has other important functionalities and Git will " +"misunderstand\n" "> your intentions if you are not accurate with the typing. For example, \n" "> if you forget `mars.txt` in the previous command.\n" "> The \"detached HEAD\" is like \"look, but don't touch\" here,\n" "> so you shouldn't make any changes in this state.\n" -"> After investigating your repo's past state, reattach your `HEAD` with `git checkout master`." +"> After investigating your repo's past state, reattach your `HEAD` with `git " +"checkout master`." msgstr "" ">\n" "> Above we used\n" @@ -3951,13 +4146,16 @@ msgstr "" "> ~~~\n" "> {: .language-bash}\n" ">\n" -"> to revert `mars.txt` to its state after the commit `f22b25e`. But be careful! \n" -"> The command `checkout` has other important functionalities and Git will misunderstand\n" +"> to revert `mars.txt` to its state after the commit `f22b25e`. But be " +"careful! \n" +"> The command `checkout` has other important functionalities and Git will " +"misunderstand\n" "> your intentions if you are not accurate with the typing. For example, \n" "> if you forget `mars.txt` in the previous command.\n" "> The \"detached HEAD\" is like \"look, but don't touch\" here,\n" "> so you shouldn't make any changes in this state.\n" -"> After investigating your repo's past state, reattach your `HEAD` with `git checkout master`." +"> After investigating your repo's past state, reattach your `HEAD` with `git " +"checkout master`." #: git-novice/_episodes/05-history.md:293 msgid "" @@ -3991,9 +4189,11 @@ msgstr "" #: git-novice/_episodes/05-history.md:306 msgid "" -"![https://figshare.com/articles/How_Git_works_a_cartoon/1328266](../fig/git_staging.svg)" +"![https://figshare.com/articles/How_Git_works_a_cartoon/1328266](../fig/" +"git_staging.svg)" msgstr "" -"![https://figshare.com/articles/How_Git_works_a_cartoon/1328266](../fig/git_staging.svg)" +"![https://figshare.com/articles/How_Git_works_a_cartoon/1328266](../fig/" +"git_staging.svg)" # blockquote, which can be cascaded #: git-novice/_episodes/05-history.md:308 @@ -4007,13 +4207,16 @@ msgid "" "> you'll see that it includes this hint:\n" ">\n" "> ~~~\n" -"> (use \"git checkout -- ...\" to discard changes in working directory)\n" +"> (use \"git checkout -- ...\" to discard changes in working " +"directory)\n" "> ~~~\n" "> {: .language-bash}\n" ">\n" "> As it says,\n" -"> `git checkout` without a version identifier restores files to the state saved in `HEAD`.\n" -"> The double dash `--` is needed to separate the names of the files being recovered\n" +"> `git checkout` without a version identifier restores files to the state " +"saved in `HEAD`.\n" +"> The double dash `--` is needed to separate the names of the files being " +"recovered\n" "> from the command itself:\n" "> without it,\n" "> Git would try to use the name of the file as the commit identifier." @@ -4023,13 +4226,16 @@ msgstr "" "> you'll see that it includes this hint:\n" ">\n" "> ~~~\n" -"> (use \"git checkout -- ...\" to discard changes in working directory)\n" +"> (use \"git checkout -- ...\" to discard changes in working " +"directory)\n" "> ~~~\n" "> {: .language-bash}\n" ">\n" "> As it says,\n" -"> `git checkout` without a version identifier restores files to the state saved in `HEAD`.\n" -"> The double dash `--` is needed to separate the names of the files being recovered\n" +"> `git checkout` without a version identifier restores files to the state " +"saved in `HEAD`.\n" +"> The double dash `--` is needed to separate the names of the files being " +"recovered\n" "> from the command itself:\n" "> without it,\n" "> Git would try to use the name of the file as the commit identifier." @@ -4062,11 +4268,14 @@ msgstr "> ## Recovering Older Versions of a File" #: git-novice/_episodes/05-history.md:336 msgid "" ">\n" -"> Jennifer has made changes to the Python script that she has been working on for weeks, and the\n" -"> modifications she made this morning \"broke\" the script and it no longer runs. She has spent\n" +"> Jennifer has made changes to the Python script that she has been working " +"on for weeks, and the\n" +"> modifications she made this morning \"broke\" the script and it no longer " +"runs. She has spent\n" "> ~ 1hr trying to fix it, with no luck...\n" ">\n" -"> Luckily, she has been keeping track of her project's versions using Git! Which commands below will\n" +"> Luckily, she has been keeping track of her project's versions using Git! " +"Which commands below will\n" "> let her recover the last committed version of her Python script called\n" "> `data_cruncher.py`?\n" ">\n" @@ -4081,11 +4290,14 @@ msgid "" "> 5. Both 2 and 4" msgstr "" ">\n" -"> Jennifer has made changes to the Python script that she has been working on for weeks, and the\n" -"> modifications she made this morning \"broke\" the script and it no longer runs. She has spent\n" +"> Jennifer has made changes to the Python script that she has been working " +"on for weeks, and the\n" +"> modifications she made this morning \"broke\" the script and it no longer " +"runs. She has spent\n" "> ~ 1hr trying to fix it, with no luck...\n" ">\n" -"> Luckily, she has been keeping track of her project's versions using Git! Which commands below will\n" +"> Luckily, she has been keeping track of her project's versions using Git! " +"Which commands below will\n" "> let her recover the last committed version of her Python script called\n" "> `data_cruncher.py`?\n" ">\n" @@ -4117,7 +4329,8 @@ msgid "" "> group repository. Below are the right steps and explanations for\n" "> Jennifer to use `git revert`, what is the missing command?\n" ">\n" -"> 1. `________ # Look at the git history of the project to find the commit ID`\n" +"> 1. `________ # Look at the git history of the project to find the commit " +"ID`\n" ">\n" "> 2. Copy the ID (the first few characters of the ID, e.g. 0b1d055).\n" ">\n" @@ -4138,7 +4351,8 @@ msgstr "" "> group repository. Below are the right steps and explanations for\n" "> Jennifer to use `git revert`, what is the missing command?\n" ">\n" -"> 1. `________ # Look at the git history of the project to find the commit ID`\n" +"> 1. `________ # Look at the git history of the project to find the commit " +"ID`\n" ">\n" "> 2. Copy the ID (the first few characters of the ID, e.g. 0b1d055).\n" ">\n" @@ -4250,7 +4464,8 @@ msgid "" ">\n" "> > ## Solution\n" "> >\n" -"> > The answer is 2 because `git add venus.txt` was used only before add the line\n" +"> > The answer is 2 because `git add venus.txt` was used only before add the " +"line\n" "> > `Venus is too hot to be suitable as a base`\n" "> > which was lost when `git checkout` was executed.\n" "> > Using the flag `-a` with `git commit` would have prevented the lost." @@ -4258,7 +4473,8 @@ msgstr "" ">\n" "> > ## Solution\n" "> >\n" -"> > The answer is 2 because `git add venus.txt` was used only before add the line\n" +"> > The answer is 2 because `git add venus.txt` was used only before add the " +"line\n" "> > `Venus is too hot to be suitable as a base`\n" "> > which was lost when `git checkout` was executed.\n" "> > Using the flag `-a` with `git commit` would have prevented the lost." @@ -4271,19 +4487,25 @@ msgstr "> ## Checking Understanding of `git diff`" #: git-novice/_episodes/05-history.md:433 msgid "" ">\n" -"> Consider this command: `git diff HEAD~3 mars.txt`. What do you predict this command\n" +"> Consider this command: `git diff HEAD~3 mars.txt`. What do you predict " +"this command\n" "> will do if you execute it? What happens when you do execute it? Why?\n" ">\n" -"> Try another command, `git diff [ID] mars.txt`, where [ID] is replaced with\n" -"> the unique identifier for your most recent commit. What do you think will happen,\n" +"> Try another command, `git diff [ID] mars.txt`, where [ID] is replaced " +"with\n" +"> the unique identifier for your most recent commit. What do you think will " +"happen,\n" "> and what does happen?" msgstr "" ">\n" -"> Consider this command: `git diff HEAD~3 mars.txt`. What do you predict this command\n" +"> Consider this command: `git diff HEAD~3 mars.txt`. What do you predict " +"this command\n" "> will do if you execute it? What happens when you do execute it? Why?\n" ">\n" -"> Try another command, `git diff [ID] mars.txt`, where [ID] is replaced with\n" -"> the unique identifier for your most recent commit. What do you think will happen,\n" +"> Try another command, `git diff [ID] mars.txt`, where [ID] is replaced " +"with\n" +"> the unique identifier for your most recent commit. What do you think will " +"happen,\n" "> and what does happen?" # blockquote, which can be cascaded @@ -4294,15 +4516,21 @@ msgstr "> ## Getting Rid of Staged Changes" #: git-novice/_episodes/05-history.md:443 msgid "" ">\n" -"> `git checkout` can be used to restore a previous commit when unstaged changes have\n" -"> been made, but will it also work for changes that have been staged but not committed?\n" -"> Make a change to `mars.txt`, add that change, and use `git checkout` to see if\n" +"> `git checkout` can be used to restore a previous commit when unstaged " +"changes have\n" +"> been made, but will it also work for changes that have been staged but not " +"committed?\n" +"> Make a change to `mars.txt`, add that change, and use `git checkout` to " +"see if\n" "> you can remove your change." msgstr "" ">\n" -"> `git checkout` can be used to restore a previous commit when unstaged changes have\n" -"> been made, but will it also work for changes that have been staged but not committed?\n" -"> Make a change to `mars.txt`, add that change, and use `git checkout` to see if\n" +"> `git checkout` can be used to restore a previous commit when unstaged " +"changes have\n" +"> been made, but will it also work for changes that have been staged but not " +"committed?\n" +"> Make a change to `mars.txt`, add that change, and use `git checkout` to " +"see if\n" "> you can remove your change." # blockquote, which can be cascaded @@ -4313,11 +4541,13 @@ msgstr "> ## Explore and Summarize Histories" #: git-novice/_episodes/05-history.md:451 msgid "" ">\n" -"> Exploring history is an important part of git, often it is a challenge to find\n" +"> Exploring history is an important part of git, often it is a challenge to " +"find\n" "> the right commit ID, especially if the commit is from several months ago.\n" ">\n" "> Imagine the `planets` project has more than 50 files.\n" -"> You would like to find a commit with specific text in `mars.txt` is modified.\n" +"> You would like to find a commit with specific text in `mars.txt` is " +"modified.\n" "> When you type `git log`, a very long list appeared,\n" "> How can you narrow down the search?\n" ">\n" @@ -4329,10 +4559,12 @@ msgid "" "> ~~~\n" "> {: .language-bash}\n" ">\n" -"> Unfortunately some of these commit messages are very ambiguous e.g. `update files`.\n" +"> Unfortunately some of these commit messages are very ambiguous e.g. " +"`update files`.\n" "> How can you search through these files?\n" ">\n" -"> Both `git diff` and `git log` are very useful and they summarize a different part of the history for you.\n" +"> Both `git diff` and `git log` are very useful and they summarize a " +"different part of the history for you.\n" "> Is it possible to combine both? Let's try the following:\n" ">\n" "> ~~~\n" @@ -4340,7 +4572,8 @@ msgid "" "> ~~~\n" "> {: .language-bash}\n" ">\n" -"> You should get a long list of output, and you should be able to see both commit messages and the difference between each commit.\n" +"> You should get a long list of output, and you should be able to see both " +"commit messages and the difference between each commit.\n" ">\n" "> Question: What does the following command do?\n" ">\n" @@ -4350,11 +4583,13 @@ msgid "" "> {: .language-bash}" msgstr "" ">\n" -"> Exploring history is an important part of git, often it is a challenge to find\n" +"> Exploring history is an important part of git, often it is a challenge to " +"find\n" "> the right commit ID, especially if the commit is from several months ago.\n" ">\n" "> Imagine the `planets` project has more than 50 files.\n" -"> You would like to find a commit with specific text in `mars.txt` is modified.\n" +"> You would like to find a commit with specific text in `mars.txt` is " +"modified.\n" "> When you type `git log`, a very long list appeared,\n" "> How can you narrow down the search?\n" ">\n" @@ -4366,10 +4601,12 @@ msgstr "" "> ~~~\n" "> {: .language-bash}\n" ">\n" -"> Unfortunately some of these commit messages are very ambiguous e.g. `update files`.\n" +"> Unfortunately some of these commit messages are very ambiguous e.g. " +"`update files`.\n" "> How can you search through these files?\n" ">\n" -"> Both `git diff` and `git log` are very useful and they summarize a different part of the history for you.\n" +"> Both `git diff` and `git log` are very useful and they summarize a " +"different part of the history for you.\n" "> Is it possible to combine both? Let's try the following:\n" ">\n" "> ~~~\n" @@ -4377,7 +4614,8 @@ msgstr "" "> ~~~\n" "> {: .language-bash}\n" ">\n" -"> You should get a long list of output, and you should be able to see both commit messages and the difference between each commit.\n" +"> You should get a long list of output, and you should be able to see both " +"commit messages and the difference between each commit.\n" ">\n" "> Question: What does the following command do?\n" ">\n" @@ -4456,7 +4694,8 @@ msgid "" "\tb.dat\n" "\tc.dat\n" "\tresults/\n" -"nothing added to commit but untracked files present (use \"git add\" to track)\n" +"nothing added to commit but untracked files present (use \"git add\" to " +"track)\n" "~~~" msgstr "" "~~~\n" @@ -4468,7 +4707,8 @@ msgstr "" "\tb.dat\n" "\tc.dat\n" "\tresults/\n" -"nothing added to commit but untracked files present (use \"git add\" to track)\n" +"nothing added to commit but untracked files present (use \"git add\" to " +"track)\n" "~~~" #: git-novice/_episodes/06-ignore.md:45 @@ -4485,7 +4725,8 @@ msgstr "" #: git-novice/_episodes/06-ignore.md:50 msgid "" -"We do this by creating a file in the root directory of our project called `.gitignore`:" +"We do this by creating a file in the root directory of our project called `." +"gitignore`:" msgstr "" "これをするには、`.gitignore` というファイルをルートディレクトリに" "作ります：" @@ -4545,7 +4786,8 @@ msgid "" " (use \"git add ...\" to include in what will be committed)\n" "\n" "\t.gitignore\n" -"nothing added to commit but untracked files present (use \"git add\" to track)\n" +"nothing added to commit but untracked files present (use \"git add\" to " +"track)\n" "~~~" msgstr "" "~~~\n" @@ -4554,7 +4796,8 @@ msgstr "" " (use \"git add ...\" to include in what will be committed)\n" "\n" "\t.gitignore\n" -"nothing added to commit but untracked files present (use \"git add\" to track)\n" +"nothing added to commit but untracked files present (use \"git add\" to " +"track)\n" "~~~" #: git-novice/_episodes/06-ignore.md:87 @@ -4601,7 +4844,8 @@ msgstr "" #: git-novice/_episodes/06-ignore.md:106 msgid "" -"As a bonus, using `.gitignore` helps us avoid accidentally adding to the repository files that we don't want to track:" +"As a bonus, using `.gitignore` helps us avoid accidentally adding to the " +"repository files that we don't want to track:" msgstr "" "`.gitignore` を作った事によって、間違えて不要なファイルを" "リポジトリに追加する事を防ぐことができます：" @@ -4712,13 +4956,15 @@ msgid "" "> >\n" "> > `results/plots/`\n" "> >\n" -"> > If, instead, you want to ignore everything in `/results/`, but wanted to track\n" +"> > If, instead, you want to ignore everything in `/results/`, but wanted to " +"track\n" "> > `results/data`, then you can add `results/` to your .gitignore\n" "> > and create an exception for the `results/data/` folder.\n" "> > The next challenge will cover this type of solution.\n" "> >\n" "> > Sometimes the `**` pattern comes in handy, too, which matches\n" -"> > multiple directory levels. E.g. `**/results/plots/*` would make git ignore\n" +"> > multiple directory levels. E.g. `**/results/plots/*` would make git " +"ignore\n" "> > the `results/plots` directory in any root directory." msgstr "" ">\n" @@ -4749,7 +4995,8 @@ msgstr "" "> > 次のチャレンジでこういった除外の仕方をします。\n" "> >\n" "> > たまに `**` パターンが役に立ちます。このパターンを使えば、\n" -"> > 複数のディレクトリに対象を適用できます。例えば、`**/results/plots/*` を使えば Git に\n" +"> > 複数のディレクトリに対象を適用できます。例えば、`**/results/plots/*` を使えば " +"Git に\n" "> > ルートディレクトリ内にある全てのディレクトリ内の `results/plots` ディレクトリを無視することができます。" # blockquote, which can be cascaded @@ -4812,12 +5059,14 @@ msgid "" "> ~~~\n" "> {: .language-bash}\n" ">\n" -"> What's the shortest `.gitignore` rule you could write to ignore all `.data`\n" +"> What's the shortest `.gitignore` rule you could write to ignore all `." +"data`\n" "> files in `result/data/position/gps`? Do not ignore the `info.txt`.\n" ">\n" "> > ## Solution\n" "> >\n" -"> > Appending `results/data/position/gps/*.data` will match every file in `results/data/position/gps` that ends with `.data`.\n" +"> > Appending `results/data/position/gps/*.data` will match every file in " +"`results/data/position/gps` that ends with `.data`.\n" "> > The file `results/data/position/gps/info.txt` will not be ignored." msgstr "" ">\n" @@ -4838,7 +5087,8 @@ msgstr "" ">\n" "> > ## 回答\n" "> >\n" -"> > `results/data/position/gps/*.data` を使えば `results/data/position/gps` 内にある全ての `.data` ファイルを無視できます。\n" +"> > `results/data/position/gps/*.data` を使えば " +"`results/data/position/gps` 内にある全ての `.data` ファイルを無視できます。\n" "> > `results/data/position/gps/info.txt` ファイルは無視されません。" # blockquote, which can be cascaded @@ -4861,8 +5111,10 @@ msgid "" ">\n" "> > ## Solution\n" "> >\n" -"> > The `!` modifier will negate an entry from a previously defined ignore pattern.\n" -"> > Because the `!*.data` entry negates all of the previous `.data` files in the `.gitignore`,\n" +"> > The `!` modifier will negate an entry from a previously defined ignore " +"pattern.\n" +"> > Because the `!*.data` entry negates all of the previous `.data` files in " +"the `.gitignore`,\n" "> > none of them will be ignored, and all `.data` files will be tracked.\n" "> >" msgstr "" @@ -4894,16 +5146,22 @@ msgstr "> ## ログファイル" #: git-novice/_episodes/06-ignore.md:242 msgid "" ">\n" -"> You wrote a script that creates many intermediate log-files of the form `log_01`, `log_02`, `log_03`, etc.\n" +"> You wrote a script that creates many intermediate log-files of the form " +"`log_01`, `log_02`, `log_03`, etc.\n" "> You want to keep them but you do not want to track them through `git`.\n" ">\n" -"> 1. Write **one** `.gitignore` entry that excludes files of the form `log_01`, `log_02`, etc.\n" +"> 1. Write **one** `.gitignore` entry that excludes files of the form " +"`log_01`, `log_02`, etc.\n" ">\n" -"> 2. Test your \"ignore pattern\" by creating some dummy files of the form `log_01`, etc.\n" +"> 2. Test your \"ignore pattern\" by creating some dummy files of the form " +"`log_01`, etc.\n" ">\n" -"> 3. You find that the file `log_01` is very important after all, add it to the tracked files without changing the `.gitignore` again.\n" +"> 3. You find that the file `log_01` is very important after all, add it to " +"the tracked files without changing the `.gitignore` again.\n" ">\n" -"> 4. Discuss with your neighbor what other types of files could reside in your directory that you do not want to track and thus would exclude via `.gitignore`.\n" +"> 4. Discuss with your neighbor what other types of files could reside in " +"your directory that you do not want to track and thus would exclude via `." +"gitignore`.\n" ">\n" "> > ## Solution\n" "> >\n" @@ -4946,10 +5204,14 @@ msgid "" "- \"Explain what remote repositories are and why they are useful.\"\n" "- \"Push to or pull from a remote repository.\"\n" "keypoints:\n" -"- \"A local Git repository can be connected to one or more remote repositories.\"\n" -"- \"Use the HTTPS protocol to connect to remote repositories until you have learned how to set up SSH.\"\n" -"- \"`git push` copies changes from a local repository to a remote repository.\"\n" -"- \"`git pull` copies changes from a remote repository to a local repository.\"\n" +"- \"A local Git repository can be connected to one or more remote " +"repositories.\"\n" +"- \"Use the HTTPS protocol to connect to remote repositories until you have " +"learned how to set up SSH.\"\n" +"- \"`git push` copies changes from a local repository to a remote repository." +"\"\n" +"- \"`git pull` copies changes from a remote repository to a local repository." +"\"\n" "---" msgstr "" "---\n" @@ -4962,45 +5224,59 @@ msgstr "" "- \"Explain what remote repositories are and why they are useful.\"\n" "- \"Push to or pull from a remote repository.\"\n" "keypoints:\n" -"- \"A local Git repository can be connected to one or more remote repositories.\"\n" -"- \"Use the HTTPS protocol to connect to remote repositories until you have learned how to set up SSH.\"\n" -"- \"`git push` copies changes from a local repository to a remote repository.\"\n" -"- \"`git pull` copies changes from a remote repository to a local repository.\"\n" +"- \"A local Git repository can be connected to one or more remote " +"repositories.\"\n" +"- \"Use the HTTPS protocol to connect to remote repositories until you have " +"learned how to set up SSH.\"\n" +"- \"`git push` copies changes from a local repository to a remote repository." +"\"\n" +"- \"`git pull` copies changes from a remote repository to a local repository." +"\"\n" "---" #: git-novice/_episodes/07-github.md:17 msgid "" "Version control really comes into its own when we begin to collaborate with\n" -"other people. We already have most of the machinery we need to do this; the\n" +"other people. We already have most of the machinery we need to do this; " +"the\n" "only thing missing is to copy changes from one repository to another." msgstr "" "Version control really comes into its own when we begin to collaborate with\n" -"other people. We already have most of the machinery we need to do this; the\n" +"other people. We already have most of the machinery we need to do this; " +"the\n" "only thing missing is to copy changes from one repository to another." #: git-novice/_episodes/07-github.md:21 msgid "" "Systems like Git allow us to move work between any two repositories. In\n" -"practice, though, it's easiest to use one copy as a central hub, and to keep it\n" +"practice, though, it's easiest to use one copy as a central hub, and to keep " +"it\n" "on the web rather than on someone's laptop. Most programmers use hosting\n" -"services like [GitHub](https://github.com), [BitBucket](https://bitbucket.org) or\n" -"[GitLab](https://gitlab.com/) to hold those master copies; we'll explore the pros\n" +"services like [GitHub](https://github.com), [BitBucket](https://bitbucket." +"org) or\n" +"[GitLab](https://gitlab.com/) to hold those master copies; we'll explore the " +"pros\n" "and cons of this in the final section of this lesson." msgstr "" "Systems like Git allow us to move work between any two repositories. In\n" -"practice, though, it's easiest to use one copy as a central hub, and to keep it\n" +"practice, though, it's easiest to use one copy as a central hub, and to keep " +"it\n" "on the web rather than on someone's laptop. Most programmers use hosting\n" -"services like [GitHub](https://github.com), [BitBucket](https://bitbucket.org) or\n" -"[GitLab](https://gitlab.com/) to hold those master copies; we'll explore the pros\n" +"services like [GitHub](https://github.com), [BitBucket](https://bitbucket." +"org) or\n" +"[GitLab](https://gitlab.com/) to hold those master copies; we'll explore the " +"pros\n" "and cons of this in the final section of this lesson." #: git-novice/_episodes/07-github.md:28 msgid "" -"Let's start by sharing the changes we've made to our current project with the\n" +"Let's start by sharing the changes we've made to our current project with " +"the\n" "world. Log in to GitHub, then click on the icon in the top right corner to\n" "create a new repository called `planets`:" msgstr "" -"Let's start by sharing the changes we've made to our current project with the\n" +"Let's start by sharing the changes we've made to our current project with " +"the\n" "world. Log in to GitHub, then click on the icon in the top right corner to\n" "create a new repository called `planets`:" @@ -5022,10 +5298,12 @@ msgstr "" #: git-novice/_episodes/07-github.md:38 msgid "" -"As soon as the repository is created, GitHub displays a page with a URL and some\n" +"As soon as the repository is created, GitHub displays a page with a URL and " +"some\n" "information on how to configure your local repository:" msgstr "" -"As soon as the repository is created, GitHub displays a page with a URL and some\n" +"As soon as the repository is created, GitHub displays a page with a URL and " +"some\n" "information on how to configure your local repository:" #: git-novice/_episodes/07-github.md:41 @@ -5055,11 +5333,15 @@ msgstr "" #: git-novice/_episodes/07-github.md:52 msgid "" -"Note that our local repository still contains our earlier work on `mars.txt`, but the\n" -"remote repository on GitHub appears empty as it doesn't contain any files yet." +"Note that our local repository still contains our earlier work on `mars." +"txt`, but the\n" +"remote repository on GitHub appears empty as it doesn't contain any files " +"yet." msgstr "" -"Note that our local repository still contains our earlier work on `mars.txt`, but the\n" -"remote repository on GitHub appears empty as it doesn't contain any files yet." +"Note that our local repository still contains our earlier work on `mars." +"txt`, but the\n" +"remote repository on GitHub appears empty as it doesn't contain any files " +"yet." #: git-novice/_episodes/07-github.md:55 msgid "" @@ -5070,12 +5352,14 @@ msgstr "" #: git-novice/_episodes/07-github.md:57 msgid "" "The next step is to connect the two repositories. We do this by making the\n" -"GitHub repository a [remote]({{ page.root }}/reference#remote) for the local repository.\n" +"GitHub repository a [remote]({{ page.root }}/reference#remote) for the local " +"repository.\n" "The home page of the repository on GitHub includes the string we need to\n" "identify it:" msgstr "" "The next step is to connect the two repositories. We do this by making the\n" -"GitHub repository a [remote]({{ page.root }}/reference#remote) for the local repository.\n" +"GitHub repository a [remote]({{ page.root }}/reference#remote) for the local " +"repository.\n" "The home page of the repository on GitHub includes the string we need to\n" "identify it:" @@ -5087,10 +5371,12 @@ msgstr "" #: git-novice/_episodes/07-github.md:64 msgid "" -"Click on the 'HTTPS' link to change the [protocol]({{ page.root }}/reference#protocol) from\n" +"Click on the 'HTTPS' link to change the [protocol]({{ page.root }}/" +"reference#protocol) from\n" "SSH to HTTPS." msgstr "" -"Click on the 'HTTPS' link to change the [protocol]({{ page.root }}/reference#protocol) from\n" +"Click on the 'HTTPS' link to change the [protocol]({{ page.root }}/" +"reference#protocol) from\n" "SSH to HTTPS." # blockquote, which can be cascaded @@ -5101,35 +5387,45 @@ msgstr "> ## HTTPS vs. SSH" #: git-novice/_episodes/07-github.md:68 msgid "" ">\n" -"> We use HTTPS here because it does not require additional configuration. After\n" -"> the workshop you may want to set up SSH access, which is a bit more secure, by\n" +"> We use HTTPS here because it does not require additional configuration. " +"After\n" +"> the workshop you may want to set up SSH access, which is a bit more " +"secure, by\n" "> following one of the great tutorials from\n" "> [GitHub](https://help.github.com/articles/generating-ssh-keys),\n" -"> [Atlassian/BitBucket](https://confluence.atlassian.com/display/BITBUCKET/Set+up+SSH+for+Git)\n" +"> [Atlassian/BitBucket](https://confluence.atlassian.com/display/BITBUCKET/" +"Set+up+SSH+for+Git)\n" "> and [GitLab](https://about.gitlab.com/2014/03/04/add-ssh-key-screencast/)\n" "> (this one has a screencast)." msgstr "" ">\n" -"> We use HTTPS here because it does not require additional configuration. After\n" -"> the workshop you may want to set up SSH access, which is a bit more secure, by\n" +"> We use HTTPS here because it does not require additional configuration. " +"After\n" +"> the workshop you may want to set up SSH access, which is a bit more " +"secure, by\n" "> following one of the great tutorials from\n" "> [GitHub](https://help.github.com/articles/generating-ssh-keys),\n" -"> [Atlassian/BitBucket](https://confluence.atlassian.com/display/BITBUCKET/Set+up+SSH+for+Git)\n" +"> [Atlassian/BitBucket](https://confluence.atlassian.com/display/BITBUCKET/" +"Set+up+SSH+for+Git)\n" "> and [GitLab](https://about.gitlab.com/2014/03/04/add-ssh-key-screencast/)\n" "> (this one has a screencast)." #: git-novice/_episodes/07-github.md:78 msgid "" -"![Changing the Repository URL on GitHub](../fig/github-change-repo-string.png)" +"![Changing the Repository URL on GitHub](../fig/github-change-repo-string." +"png)" msgstr "" -"![Changing the Repository URL on GitHub](../fig/github-change-repo-string.png)" +"![Changing the Repository URL on GitHub](../fig/github-change-repo-string." +"png)" #: git-novice/_episodes/07-github.md:80 msgid "" -"Copy that URL from the browser, go into the local `planets` repository, and run\n" +"Copy that URL from the browser, go into the local `planets` repository, and " +"run\n" "this command:" msgstr "" -"Copy that URL from the browser, go into the local `planets` repository, and run\n" +"Copy that URL from the browser, go into the local `planets` repository, and " +"run\n" "this command:" # code block @@ -5181,18 +5477,24 @@ msgstr "" #: git-novice/_episodes/07-github.md:104 msgid "" -"The name `origin` is a local nickname for your remote repository. We could use\n" -"something else if we wanted to, but `origin` is by far the most common choice." +"The name `origin` is a local nickname for your remote repository. We could " +"use\n" +"something else if we wanted to, but `origin` is by far the most common " +"choice." msgstr "" -"The name `origin` is a local nickname for your remote repository. We could use\n" -"something else if we wanted to, but `origin` is by far the most common choice." +"The name `origin` is a local nickname for your remote repository. We could " +"use\n" +"something else if we wanted to, but `origin` is by far the most common " +"choice." #: git-novice/_episodes/07-github.md:107 msgid "" -"Once the nickname `origin` is set up, this command will push the changes from\n" +"Once the nickname `origin` is set up, this command will push the changes " +"from\n" "our local repository to the repository on GitHub:" msgstr "" -"Once the nickname `origin` is set up, this command will push the changes from\n" +"Once the nickname `origin` is set up, this command will push the changes " +"from\n" "our local repository to the repository on GitHub:" # code block @@ -5237,8 +5539,10 @@ msgstr "" #: git-novice/_episodes/07-github.md:128 msgid "" ">\n" -"> If the network you are connected to uses a proxy, there is a chance that your\n" -"> last command failed with \"Could not resolve hostname\" as the error message. To\n" +"> If the network you are connected to uses a proxy, there is a chance that " +"your\n" +"> last command failed with \"Could not resolve hostname\" as the error " +"message. To\n" "> solve this issue, you need to tell Git about the proxy:\n" ">\n" "> ~~~\n" @@ -5247,7 +5551,8 @@ msgid "" "> ~~~\n" "> {: .language-bash}\n" ">\n" -"> When you connect to another network that doesn't use a proxy, you will need to\n" +"> When you connect to another network that doesn't use a proxy, you will " +"need to\n" "> tell Git to disable the proxy using:\n" ">\n" "> ~~~\n" @@ -5257,8 +5562,10 @@ msgid "" "> {: .language-bash}" msgstr "" ">\n" -"> If the network you are connected to uses a proxy, there is a chance that your\n" -"> last command failed with \"Could not resolve hostname\" as the error message. To\n" +"> If the network you are connected to uses a proxy, there is a chance that " +"your\n" +"> last command failed with \"Could not resolve hostname\" as the error " +"message. To\n" "> solve this issue, you need to tell Git about the proxy:\n" ">\n" "> ~~~\n" @@ -5267,7 +5574,8 @@ msgstr "" "> ~~~\n" "> {: .language-bash}\n" ">\n" -"> When you connect to another network that doesn't use a proxy, you will need to\n" +"> When you connect to another network that doesn't use a proxy, you will " +"need to\n" "> tell Git to disable the proxy using:\n" ">\n" "> ~~~\n" @@ -5284,10 +5592,13 @@ msgstr "> ## Password Managers" #: git-novice/_episodes/07-github.md:150 msgid "" ">\n" -"> If your operating system has a password manager configured, `git push` will\n" -"> try to use it when it needs your username and password. For example, this\n" +"> If your operating system has a password manager configured, `git push` " +"will\n" +"> try to use it when it needs your username and password. For example, " +"this\n" "> is the default behavior for Git Bash on Windows. If you want to type your\n" -"> username and password at the terminal instead of using a password manager,\n" +"> username and password at the terminal instead of using a password " +"manager,\n" "> type:\n" ">\n" "> ~~~\n" @@ -5297,18 +5608,23 @@ msgid "" ">\n" "> in the terminal, before you run `git push`. Despite the name, [git uses\n" "> `SSH_ASKPASS` for all credential\n" -"> entry](https://git-scm.com/docs/gitcredentials#_requesting_credentials), so\n" +"> entry](https://git-scm.com/docs/gitcredentials#_requesting_credentials), " +"so\n" "> you may want to unset `SSH_ASKPASS` whether you are using git via SSH or\n" "> https.\n" ">\n" -"> You may also want to add `unset SSH_ASKPASS` at the end of your `~/.language-bashrc`\n" +"> You may also want to add `unset SSH_ASKPASS` at the end of your `~/." +"language-bashrc`\n" "> to make git default to using the terminal for usernames and passwords." msgstr "" ">\n" -"> If your operating system has a password manager configured, `git push` will\n" -"> try to use it when it needs your username and password. For example, this\n" +"> If your operating system has a password manager configured, `git push` " +"will\n" +"> try to use it when it needs your username and password. For example, " +"this\n" "> is the default behavior for Git Bash on Windows. If you want to type your\n" -"> username and password at the terminal instead of using a password manager,\n" +"> username and password at the terminal instead of using a password " +"manager,\n" "> type:\n" ">\n" "> ~~~\n" @@ -5318,11 +5634,13 @@ msgstr "" ">\n" "> in the terminal, before you run `git push`. Despite the name, [git uses\n" "> `SSH_ASKPASS` for all credential\n" -"> entry](https://git-scm.com/docs/gitcredentials#_requesting_credentials), so\n" +"> entry](https://git-scm.com/docs/gitcredentials#_requesting_credentials), " +"so\n" "> you may want to unset `SSH_ASKPASS` whether you are using git via SSH or\n" "> https.\n" ">\n" -"> You may also want to add `unset SSH_ASKPASS` at the end of your `~/.language-bashrc`\n" +"> You may also want to add `unset SSH_ASKPASS` at the end of your `~/." +"language-bashrc`\n" "> to make git default to using the terminal for usernames and passwords." #: git-novice/_episodes/07-github.md:172 @@ -5331,9 +5649,11 @@ msgstr "Our local and remote repositories are now in this state:" #: git-novice/_episodes/07-github.md:174 msgid "" -"![GitHub Repository After First Push](../fig/github-repo-after-first-push.svg)" +"![GitHub Repository After First Push](../fig/github-repo-after-first-push." +"svg)" msgstr "" -"![GitHub Repository After First Push](../fig/github-repo-after-first-push.svg)" +"![GitHub Repository After First Push](../fig/github-repo-after-first-push." +"svg)" # blockquote, which can be cascaded #: git-novice/_episodes/07-github.md:176 @@ -5343,17 +5663,25 @@ msgstr "> ## The '-u' Flag" #: git-novice/_episodes/07-github.md:177 msgid "" ">\n" -"> You may see a `-u` option used with `git push` in some documentation. This\n" -"> option is synonymous with the `--set-upstream-to` option for the `git branch`\n" -"> command, and is used to associate the current branch with a remote branch so\n" -"> that the `git pull` command can be used without any arguments. To do this,\n" +"> You may see a `-u` option used with `git push` in some documentation. " +"This\n" +"> option is synonymous with the `--set-upstream-to` option for the `git " +"branch`\n" +"> command, and is used to associate the current branch with a remote branch " +"so\n" +"> that the `git pull` command can be used without any arguments. To do " +"this,\n" "> simply use `git push -u origin master` once the remote has been set up." msgstr "" ">\n" -"> You may see a `-u` option used with `git push` in some documentation. This\n" -"> option is synonymous with the `--set-upstream-to` option for the `git branch`\n" -"> command, and is used to associate the current branch with a remote branch so\n" -"> that the `git pull` command can be used without any arguments. To do this,\n" +"> You may see a `-u` option used with `git push` in some documentation. " +"This\n" +"> option is synonymous with the `--set-upstream-to` option for the `git " +"branch`\n" +"> command, and is used to associate the current branch with a remote branch " +"so\n" +"> that the `git pull` command can be used without any arguments. To do " +"this,\n" "> simply use `git push -u origin master` once the remote has been set up." #: git-novice/_episodes/07-github.md:185 @@ -5416,11 +5744,23 @@ msgid "" "> How would you get that same information in the shell?\n" ">\n" "> > ## Solution\n" -"> > The left-most button (with the picture of a clipboard) copies the full identifier of the commit to the clipboard. In the shell, ```git log``` will show you the full commit identifier for each commit.\n" +"> > The left-most button (with the picture of a clipboard) copies the full " +"identifier of the commit to the clipboard. In the shell, ```git log``` will " +"show you the full commit identifier for each commit.\n" "> >\n" -"> > When you click on the middle button, you'll see all of the changes that were made in that particular commit. Green shaded lines indicate additions and red ones removals. In the shell we can do the same thing with ```git diff```. In particular, ```git diff ID1..ID2``` where ID1 and ID2 are commit identifiers (e.g. ```git diff a3bf1e5..041e637```) will show the differences between those two commits.\n" +"> > When you click on the middle button, you'll see all of the changes that " +"were made in that particular commit. Green shaded lines indicate additions " +"and red ones removals. In the shell we can do the same thing with ```git " +"diff```. In particular, ```git diff ID1..ID2``` where ID1 and ID2 are commit " +"identifiers (e.g. ```git diff a3bf1e5..041e637```) will show the differences " +"between those two commits.\n" "> >\n" -"> > The right-most button lets you view all of the files in the repository at the time of that commit. To do this in the shell, we'd need to checkout the repository at that particular time. We can do this with ```git checkout ID``` where ID is the identifier of the commit we want to look at. If we do this, we need to remember to put the repository back to the right state afterwards!" +"> > The right-most button lets you view all of the files in the repository " +"at the time of that commit. To do this in the shell, we'd need to checkout " +"the repository at that particular time. We can do this with ```git checkout " +"ID``` where ID is the identifier of the commit we want to look at. If we do " +"this, we need to remember to put the repository back to the right state " +"afterwards!" msgstr "" ">\n" "> Browse to your `planets` repository on GitHub.\n" @@ -5431,11 +5771,23 @@ msgstr "" "> How would you get that same information in the shell?\n" ">\n" "> > ## Solution\n" -"> > The left-most button (with the picture of a clipboard) copies the full identifier of the commit to the clipboard. In the shell, ```git log``` will show you the full commit identifier for each commit.\n" -"> >\n" -"> > When you click on the middle button, you'll see all of the changes that were made in that particular commit. Green shaded lines indicate additions and red ones removals. In the shell we can do the same thing with ```git diff```. In particular, ```git diff ID1..ID2``` where ID1 and ID2 are commit identifiers (e.g. ```git diff a3bf1e5..041e637```) will show the differences between those two commits.\n" -"> >\n" -"> > The right-most button lets you view all of the files in the repository at the time of that commit. To do this in the shell, we'd need to checkout the repository at that particular time. We can do this with ```git checkout ID``` where ID is the identifier of the commit we want to look at. If we do this, we need to remember to put the repository back to the right state afterwards!" +"> > The left-most button (with the picture of a clipboard) copies the full " +"identifier of the commit to the clipboard. In the shell, ```git log``` will " +"show you the full commit identifier for each commit.\n" +"> >\n" +"> > When you click on the middle button, you'll see all of the changes that " +"were made in that particular commit. Green shaded lines indicate additions " +"and red ones removals. In the shell we can do the same thing with ```git " +"diff```. In particular, ```git diff ID1..ID2``` where ID1 and ID2 are commit " +"identifiers (e.g. ```git diff a3bf1e5..041e637```) will show the differences " +"between those two commits.\n" +"> >\n" +"> > The right-most button lets you view all of the files in the repository " +"at the time of that commit. To do this in the shell, we'd need to checkout " +"the repository at that particular time. We can do this with ```git checkout " +"ID``` where ID is the identifier of the commit we want to look at. If we do " +"this, we need to remember to put the repository back to the right state " +"afterwards!" # blockquote, which can be cascaded #: git-novice/_episodes/07-github.md:220 @@ -5448,21 +5800,29 @@ msgid "" "> Create a remote repository on GitHub. Push the contents of your local\n" "> repository to the remote. Make changes to your local repository and push\n" "> these changes. Go to the repo you just created on GitHub and check the\n" -"> [timestamps]({{ page.root }}/reference#timestamp) of the files. How does GitHub record\n" +"> [timestamps]({{ page.root }}/reference#timestamp) of the files. How does " +"GitHub record\n" "> times, and why?\n" ">\n" "> > ## Solution\n" -"> > GitHub displays timestamps in a human readable relative format (i.e. \"22 hours ago\" or \"three weeks ago\"). However, if you hover over the timestamp, you can see the exact time at which the last change to the file occurred." +"> > GitHub displays timestamps in a human readable relative format (i.e. " +"\"22 hours ago\" or \"three weeks ago\"). However, if you hover over the " +"timestamp, you can see the exact time at which the last change to the file " +"occurred." msgstr "" ">\n" "> Create a remote repository on GitHub. Push the contents of your local\n" "> repository to the remote. Make changes to your local repository and push\n" "> these changes. Go to the repo you just created on GitHub and check the\n" -"> [timestamps]({{ page.root }}/reference#timestamp) of the files. How does GitHub record\n" +"> [timestamps]({{ page.root }}/reference#timestamp) of the files. How does " +"GitHub record\n" "> times, and why?\n" ">\n" "> > ## Solution\n" -"> > GitHub displays timestamps in a human readable relative format (i.e. \"22 hours ago\" or \"three weeks ago\"). However, if you hover over the timestamp, you can see the exact time at which the last change to the file occurred." +"> > GitHub displays timestamps in a human readable relative format (i.e. " +"\"22 hours ago\" or \"three weeks ago\"). However, if you hover over the " +"timestamp, you can see the exact time at which the last change to the file " +"occurred." # blockquote, which can be cascaded #: git-novice/_episodes/07-github.md:233 @@ -5476,14 +5836,20 @@ msgid "" "> How is \"git push\" different from \"git commit\"?\n" ">\n" "> > ## Solution\n" -"> > When we push changes, we're interacting with a remote repository to update it with the changes we've made locally (often this corresponds to sharing the changes we've made with others). Commit only updates your local repository." +"> > When we push changes, we're interacting with a remote repository to " +"update it with the changes we've made locally (often this corresponds to " +"sharing the changes we've made with others). Commit only updates your local " +"repository." msgstr "" ">\n" "> In this lesson, we introduced the \"git push\" command.\n" "> How is \"git push\" different from \"git commit\"?\n" ">\n" "> > ## Solution\n" -"> > When we push changes, we're interacting with a remote repository to update it with the changes we've made locally (often this corresponds to sharing the changes we've made with others). Commit only updates your local repository." +"> > When we push changes, we're interacting with a remote repository to " +"update it with the changes we've made locally (often this corresponds to " +"sharing the changes we've made with others). Commit only updates your local " +"repository." # blockquote, which can be cascaded #: git-novice/_episodes/07-github.md:243 @@ -5509,7 +5875,10 @@ msgid "" "> done with this exercise.\n" ">\n" "> > ## Solution\n" -"> > We don't see any error message when we add the remote (adding the remote tells git about it, but doesn't try to use it yet). As soon as we try to use ```git push``` we'll see an error message. The command ```git remote set-url``` allows us to change the remote's URL to fix it." +"> > We don't see any error message when we add the remote (adding the remote " +"tells git about it, but doesn't try to use it yet). As soon as we try to use " +"```git push``` we'll see an error message. The command ```git remote set-" +"url``` allows us to change the remote's URL to fix it." msgstr "" ">\n" "> It happens quite often in practice that you made a typo in the\n" @@ -5528,7 +5897,10 @@ msgstr "" "> done with this exercise.\n" ">\n" "> > ## Solution\n" -"> > We don't see any error message when we add the remote (adding the remote tells git about it, but doesn't try to use it yet). As soon as we try to use ```git push``` we'll see an error message. The command ```git remote set-url``` allows us to change the remote's URL to fix it." +"> > We don't see any error message when we add the remote (adding the remote " +"tells git about it, but doesn't try to use it yet). As soon as we try to use " +"```git push``` we'll see an error message. The command ```git remote set-" +"url``` allows us to change the remote's URL to fix it." # blockquote, which can be cascaded #: git-novice/_episodes/07-github.md:265 @@ -5538,20 +5910,28 @@ msgstr "> ## GitHub License and README files" #: git-novice/_episodes/07-github.md:266 msgid "" ">\n" -"> In this section we learned about creating a remote repository on GitHub, but when you initialized your\n" -"> GitHub repo, you didn't add a README.md or a license file. If you had, what do you think would have happened when\n" +"> In this section we learned about creating a remote repository on GitHub, " +"but when you initialized your\n" +"> GitHub repo, you didn't add a README.md or a license file. If you had, " +"what do you think would have happened when\n" "> you tried to link your local and remote repositories?\n" ">\n" "> > ## Solution\n" -"> > In this case, since we already had a README file in our own (local) repository, we'd see a merge conflict (when git realises that there are two versions of the file and asks us to reconcile the differences)." +"> > In this case, since we already had a README file in our own (local) " +"repository, we'd see a merge conflict (when git realises that there are two " +"versions of the file and asks us to reconcile the differences)." msgstr "" ">\n" -"> In this section we learned about creating a remote repository on GitHub, but when you initialized your\n" -"> GitHub repo, you didn't add a README.md or a license file. If you had, what do you think would have happened when\n" +"> In this section we learned about creating a remote repository on GitHub, " +"but when you initialized your\n" +"> GitHub repo, you didn't add a README.md or a license file. If you had, " +"what do you think would have happened when\n" "> you tried to link your local and remote repositories?\n" ">\n" "> > ## Solution\n" -"> > In this case, since we already had a README file in our own (local) repository, we'd see a merge conflict (when git realises that there are two versions of the file and asks us to reconcile the differences)." +"> > In this case, since we already had a README file in our own (local) " +"repository, we'd see a merge conflict (when git realises that there are two " +"versions of the file and asks us to reconcile the differences)." # Front Matter #: git-novice/_episodes/08-collab.md:1 @@ -5567,7 +5947,8 @@ msgid "" "- \"Collaborate pushing to a common repository.\"\n" "- \"Describe the basic collaborative workflow.\"\n" "keypoints:\n" -"- \"`git clone` copies a remote repository to create a local repository with a remote called `origin` automatically set up.\"\n" +"- \"`git clone` copies a remote repository to create a local repository with " +"a remote called `origin` automatically set up.\"\n" "---" msgstr "" "---\n" @@ -5581,19 +5962,26 @@ msgstr "" "- \"Collaborate pushing to a common repository.\"\n" "- \"Describe the basic collaborative workflow.\"\n" "keypoints:\n" -"- \"`git clone` copies a remote repository to create a local repository with a remote called `origin` automatically set up.\"\n" +"- \"`git clone` copies a remote repository to create a local repository with " +"a remote called `origin` automatically set up.\"\n" "---" #: git-novice/_episodes/08-collab.md:15 msgid "" -"For the next step, get into pairs. One person will be the \"Owner\" and the other\n" -"will be the \"Collaborator\". The goal is that the Collaborator add changes into\n" -"the Owner's repository. We will switch roles at the end, so both persons will\n" +"For the next step, get into pairs. One person will be the \"Owner\" and the " +"other\n" +"will be the \"Collaborator\". The goal is that the Collaborator add changes " +"into\n" +"the Owner's repository. We will switch roles at the end, so both persons " +"will\n" "play Owner and Collaborator." msgstr "" -"For the next step, get into pairs. One person will be the \"Owner\" and the other\n" -"will be the \"Collaborator\". The goal is that the Collaborator add changes into\n" -"the Owner's repository. We will switch roles at the end, so both persons will\n" +"For the next step, get into pairs. One person will be the \"Owner\" and the " +"other\n" +"will be the \"Collaborator\". The goal is that the Collaborator add changes " +"into\n" +"the Owner's repository. We will switch roles at the end, so both persons " +"will\n" "play Owner and Collaborator." # blockquote, which can be cascaded @@ -5604,16 +5992,20 @@ msgstr "> ## Practicing By Yourself" #: git-novice/_episodes/08-collab.md:21 msgid "" ">\n" -"> If you're working through this lesson on your own, you can carry on by opening\n" +"> If you're working through this lesson on your own, you can carry on by " +"opening\n" "> a second terminal window.\n" "> This window will represent your partner, working on another computer. You\n" -"> won't need to give anyone access on GitHub, because both 'partners' are you." +"> won't need to give anyone access on GitHub, because both 'partners' are " +"you." msgstr "" ">\n" -"> If you're working through this lesson on your own, you can carry on by opening\n" +"> If you're working through this lesson on your own, you can carry on by " +"opening\n" "> a second terminal window.\n" "> This window will represent your partner, working on another computer. You\n" -"> won't need to give anyone access on GitHub, because both 'partners' are you." +"> won't need to give anyone access on GitHub, because both 'partners' are " +"you." #: git-novice/_episodes/08-collab.md:28 msgid "" @@ -5632,20 +6024,24 @@ msgstr "![Adding Collaborators on GitHub](../fig/github-add-collaborators.png)" #: git-novice/_episodes/08-collab.md:34 msgid "" "To accept access to the Owner's repo, the Collaborator\n" -"needs to go to [https://github.com/notifications](https://github.com/notifications).\n" +"needs to go to [https://github.com/notifications](https://github.com/" +"notifications).\n" "Once there she can accept access to the Owner's repo." msgstr "" "To accept access to the Owner's repo, the Collaborator\n" -"needs to go to [https://github.com/notifications](https://github.com/notifications).\n" +"needs to go to [https://github.com/notifications](https://github.com/" +"notifications).\n" "Once there she can accept access to the Owner's repo." #: git-novice/_episodes/08-collab.md:38 msgid "" -"Next, the Collaborator needs to download a copy of the Owner's repository to her\n" +"Next, the Collaborator needs to download a copy of the Owner's repository to " +"her\n" " machine. This is called \"cloning a repo\". To clone the Owner's repo into\n" "her `Desktop` folder, the Collaborator enters:" msgstr "" -"Next, the Collaborator needs to download a copy of the Owner's repository to her\n" +"Next, the Collaborator needs to download a copy of the Owner's repository to " +"her\n" " machine. This is called \"cloning a repo\". To clone the Owner's repo into\n" "her `Desktop` folder, the Collaborator enters:" @@ -5670,10 +6066,12 @@ msgstr "![After Creating Clone of Repository](../fig/github-collaboration.svg)" #: git-novice/_episodes/08-collab.md:51 msgid "" -"The Collaborator can now make a change in her clone of the Owner's repository,\n" +"The Collaborator can now make a change in her clone of the Owner's " +"repository,\n" "exactly the same way as we've been doing before:" msgstr "" -"The Collaborator can now make a change in her clone of the Owner's repository,\n" +"The Collaborator can now make a change in her clone of the Owner's " +"repository,\n" "exactly the same way as we've been doing before:" # code block @@ -5767,12 +6165,16 @@ msgstr "" #: git-novice/_episodes/08-collab.md:100 msgid "" -"Take a look to the Owner's repository on its GitHub website now (maybe you need\n" -"to refresh your browser.) You should be able to see the new commit made by the\n" +"Take a look to the Owner's repository on its GitHub website now (maybe you " +"need\n" +"to refresh your browser.) You should be able to see the new commit made by " +"the\n" "Collaborator." msgstr "" -"Take a look to the Owner's repository on its GitHub website now (maybe you need\n" -"to refresh your browser.) You should be able to see the new commit made by the\n" +"Take a look to the Owner's repository on its GitHub website now (maybe you " +"need\n" +"to refresh your browser.) You should be able to see the new commit made by " +"the\n" "Collaborator." #: git-novice/_episodes/08-collab.md:104 @@ -5814,10 +6216,12 @@ msgstr "" #: git-novice/_episodes/08-collab.md:126 msgid "" -"Now the three repositories (Owner's local, Collaborator's local, and Owner's on\n" +"Now the three repositories (Owner's local, Collaborator's local, and Owner's " +"on\n" "GitHub) are back in sync." msgstr "" -"Now the three repositories (Owner's local, Collaborator's local, and Owner's on\n" +"Now the three repositories (Owner's local, Collaborator's local, and Owner's " +"on\n" "GitHub) are back in sync." # blockquote, which can be cascaded @@ -5828,8 +6232,10 @@ msgstr "> ## A Basic Collaborative Workflow" #: git-novice/_episodes/08-collab.md:130 msgid "" ">\n" -"> In practice, it is good to be sure that you have an updated version of the\n" -"> repository you are collaborating on, so you should `git pull` before making\n" +"> In practice, it is good to be sure that you have an updated version of " +"the\n" +"> repository you are collaborating on, so you should `git pull` before " +"making\n" "> our changes. The basic collaborative workflow would be:\n" ">\n" "> * update your local repo with `git pull origin master`,\n" @@ -5842,8 +6248,10 @@ msgid "" "> read and review." msgstr "" ">\n" -"> In practice, it is good to be sure that you have an updated version of the\n" -"> repository you are collaborating on, so you should `git pull` before making\n" +"> In practice, it is good to be sure that you have an updated version of " +"the\n" +"> repository you are collaborating on, so you should `git pull` before " +"making\n" "> our changes. The basic collaborative workflow would be:\n" ">\n" "> * update your local repo with `git pull origin master`,\n" @@ -5877,42 +6285,60 @@ msgstr "> ## Review Changes" msgid "" ">\n" "> The Owner pushed commits to the repository without giving any information\n" -"> to the Collaborator. How can the Collaborator find out what has changed with\n" +"> to the Collaborator. How can the Collaborator find out what has changed " +"with\n" "> command line? And on GitHub?\n" ">\n" "> > ## Solution\n" -"> > On the command line, the Collaborator can use ```git fetch origin master```\n" -"> > to get the remote changes into the local repository, but without merging\n" -"> > them. Then by running ```git diff master origin/master``` the Collaborator\n" +"> > On the command line, the Collaborator can use ```git fetch origin " +"master```\n" +"> > to get the remote changes into the local repository, but without " +"merging\n" +"> > them. Then by running ```git diff master origin/master``` the " +"Collaborator\n" "> > will see the changes output in the terminal.\n" "> >\n" -"> > On GitHub, the Collaborator can go to their own fork of the repository and\n" +"> > On GitHub, the Collaborator can go to their own fork of the repository " +"and\n" "> > look right above the light blue latest commit bar for a gray bar saying\n" -"> > \"This branch is 1 commit behind Our-Repository:master.\" On the far right of\n" +"> > \"This branch is 1 commit behind Our-Repository:master.\" On the far " +"right of\n" "> > that gray bar is a Compare icon and link. On the Compare page the\n" -"> > Collaborator should change the base fork to their own repository, then click\n" -"> > the link in the paragraph above to \"compare across forks\", and finally\n" -"> > change the head fork to the main repository. This will show all the commits\n" +"> > Collaborator should change the base fork to their own repository, then " +"click\n" +"> > the link in the paragraph above to \"compare across forks\", and " +"finally\n" +"> > change the head fork to the main repository. This will show all the " +"commits\n" "> > that are different." msgstr "" ">\n" "> The Owner pushed commits to the repository without giving any information\n" -"> to the Collaborator. How can the Collaborator find out what has changed with\n" +"> to the Collaborator. How can the Collaborator find out what has changed " +"with\n" "> command line? And on GitHub?\n" ">\n" "> > ## Solution\n" -"> > On the command line, the Collaborator can use ```git fetch origin master```\n" -"> > to get the remote changes into the local repository, but without merging\n" -"> > them. Then by running ```git diff master origin/master``` the Collaborator\n" +"> > On the command line, the Collaborator can use ```git fetch origin " +"master```\n" +"> > to get the remote changes into the local repository, but without " +"merging\n" +"> > them. Then by running ```git diff master origin/master``` the " +"Collaborator\n" "> > will see the changes output in the terminal.\n" "> >\n" -"> > On GitHub, the Collaborator can go to their own fork of the repository and\n" +"> > On GitHub, the Collaborator can go to their own fork of the repository " +"and\n" "> > look right above the light blue latest commit bar for a gray bar saying\n" -"> > \"This branch is 1 commit behind Our-Repository:master.\" On the far right of\n" +"> > \"This branch is 1 commit behind Our-Repository:master.\" On the far " +"right of\n" "> > that gray bar is a Compare icon and link. On the Compare page the\n" -"> > Collaborator should change the base fork to their own repository, then click\n" -"> > the link in the paragraph above to \"compare across forks\", and finally\n" -"> > change the head fork to the main repository. This will show all the commits\n" +"> > Collaborator should change the base fork to their own repository, then " +"click\n" +"> > the link in the paragraph above to \"compare across forks\", and " +"finally\n" +"> > change the head fork to the main repository. This will show all the " +"commits\n" "> > that are different." # blockquote, which can be cascaded @@ -5923,19 +6349,23 @@ msgstr "> ## Comment Changes in GitHub" #: git-novice/_episodes/08-collab.md:174 msgid "" ">\n" -"> The Collaborator has some questions about one line change made by the Owner and\n" +"> The Collaborator has some questions about one line change made by the " +"Owner and\n" "> has some suggestions to propose.\n" ">\n" -"> With GitHub, it is possible to comment the diff of a commit. Over the line of\n" +"> With GitHub, it is possible to comment the diff of a commit. Over the line " +"of\n" "> code to comment, a blue comment icon appears to open a comment window.\n" ">\n" "> The Collaborator posts its comments and suggestions using GitHub interface." msgstr "" ">\n" -"> The Collaborator has some questions about one line change made by the Owner and\n" +"> The Collaborator has some questions about one line change made by the " +"Owner and\n" "> has some suggestions to propose.\n" ">\n" -"> With GitHub, it is possible to comment the diff of a commit. Over the line of\n" +"> With GitHub, it is possible to comment the diff of a commit. Over the line " +"of\n" "> code to comment, a blue comment icon appears to open a comment window.\n" ">\n" "> The Collaborator posts its comments and suggestions using GitHub interface." @@ -5948,13 +6378,17 @@ msgstr "> ## Version History, Backup, and Version Control" #: git-novice/_episodes/08-collab.md:185 msgid "" ">\n" -"> Some backup software can keep a history of the versions of your files. They also\n" -"> allows you to recover specific versions. How is this functionality different from version control?\n" +"> Some backup software can keep a history of the versions of your files. " +"They also\n" +"> allows you to recover specific versions. How is this functionality " +"different from version control?\n" "> What are some of the benefits of using version control, Git and GitHub?" msgstr "" ">\n" -"> Some backup software can keep a history of the versions of your files. They also\n" -"> allows you to recover specific versions. How is this functionality different from version control?\n" +"> Some backup software can keep a history of the versions of your files. " +"They also\n" +"> allows you to recover specific versions. How is this functionality " +"different from version control?\n" "> What are some of the benefits of using version control, Git and GitHub?" # Front Matter @@ -5970,8 +6404,11 @@ msgid "" "- \"Explain what conflicts are and when they can occur.\"\n" "- \"Resolve conflicts resulting from a merge.\"\n" "keypoints:\n" -"- \"Conflicts occur when two or more people change the same file(s) at the same time.\"\n" -"- \"The version control system does not allow people to overwrite each other's changes blindly, but highlights conflicts so that they can be resolved.\"\n" +"- \"Conflicts occur when two or more people change the same file(s) at the " +"same time.\"\n" +"- \"The version control system does not allow people to overwrite each " +"other's changes blindly, but highlights conflicts so that they can be " +"resolved.\"\n" "---" msgstr "" "---\n" @@ -5984,22 +6421,27 @@ msgstr "" "- \"Explain what conflicts are and when they can occur.\"\n" "- \"Resolve conflicts resulting from a merge.\"\n" "keypoints:\n" -"- \"Conflicts occur when two or more people change the same file(s) at the same time.\"\n" -"- \"The version control system does not allow people to overwrite each other's changes blindly, but highlights conflicts so that they can be resolved.\"\n" +"- \"Conflicts occur when two or more people change the same file(s) at the " +"same time.\"\n" +"- \"The version control system does not allow people to overwrite each " +"other's changes blindly, but highlights conflicts so that they can be " +"resolved.\"\n" "---" #: git-novice/_episodes/09-conflict.md:15 msgid "" "As soon as people can work in parallel, they'll likely step on each other's\n" "toes. This will even happen with a single person: if we are working on\n" -"a piece of software on both our laptop and a server in the lab, we could make\n" +"a piece of software on both our laptop and a server in the lab, we could " +"make\n" "different changes to each copy. Version control helps us manage these\n" "[conflicts]({{ page.root }}/reference#conflicts) by giving us tools to\n" "[resolve]({{ page.root }}/reference#resolve) overlapping changes." msgstr "" "As soon as people can work in parallel, they'll likely step on each other's\n" "toes. This will even happen with a single person: if we are working on\n" -"a piece of software on both our laptop and a server in the lab, we could make\n" +"a piece of software on both our laptop and a server in the lab, we could " +"make\n" "different changes to each copy. Version control helps us manage these\n" "[conflicts]({{ page.root }}/reference#conflicts) by giving us tools to\n" "[resolve]({{ page.root }}/reference#resolve) overlapping changes." @@ -6007,11 +6449,13 @@ msgstr "" #: git-novice/_episodes/09-conflict.md:22 msgid "" "To see how we can resolve conflicts, we must first create one. The file\n" -"`mars.txt` currently looks like this in both partners' copies of our `planets`\n" +"`mars.txt` currently looks like this in both partners' copies of our " +"`planets`\n" "repository:" msgstr "" "To see how we can resolve conflicts, we must first create one. The file\n" -"`mars.txt` currently looks like this in both partners' copies of our `planets`\n" +"`mars.txt` currently looks like this in both partners' copies of our " +"`planets`\n" "repository:" #: git-novice/_episodes/09-conflict.md:38 @@ -6156,7 +6600,8 @@ msgid "" "To https://github.com/vlad/planets.git\n" " ! [rejected] master -> master (non-fast-forward)\n" "error: failed to push some refs to 'https://github.com/vlad/planets.git'\n" -"hint: Updates were rejected because the tip of your current branch is behind\n" +"hint: Updates were rejected because the tip of your current branch is " +"behind\n" "hint: its remote counterpart. Merge the remote changes (e.g. 'git pull')\n" "hint: before pushing again.\n" "hint: See the 'Note about fast-forwards' in 'git push --help' for details.\n" @@ -6166,7 +6611,8 @@ msgstr "" "To https://github.com/nobita/planets.git\n" " ! [rejected] master -> master (non-fast-forward)\n" "error: failed to push some refs to 'https://github.com/vlad/planets.git'\n" -"hint: Updates were rejected because the tip of your current branch is behind\n" +"hint: Updates were rejected because the tip of your current branch is " +"behind\n" "hint: its remote counterpart. Merge the remote changes (e.g. 'git pull')\n" "hint: before pushing again.\n" "hint: See the 'Note about fast-forwards' in 'git push --help' for details.\n" @@ -6178,17 +6624,21 @@ msgstr "![The Conflicting Changes](../fig/conflict.svg)" #: git-novice/_episodes/09-conflict.md:136 msgid "" -"Git rejects the push because it detects that the remote repository has new updates that have not been\n" +"Git rejects the push because it detects that the remote repository has new " +"updates that have not been\n" "incorporated into the local branch.\n" "What we have to do is pull the changes from GitHub,\n" -"[merge]({{ page.root }}/reference#merge) them into the copy we're currently working in,\n" +"[merge]({{ page.root }}/reference#merge) them into the copy we're currently " +"working in,\n" "and then push that.\n" "Let's start by pulling:" msgstr "" -"Git rejects the push because it detects that the remote repository has new updates that have not been\n" +"Git rejects the push because it detects that the remote repository has new " +"updates that have not been\n" "incorporated into the local branch.\n" "What we have to do is pull the changes from GitHub,\n" -"[merge]({{ page.root }}/reference#merge) them into the copy we're currently working in,\n" +"[merge]({{ page.root }}/reference#merge) them into the copy we're currently " +"working in,\n" "and then push that.\n" "Let's start by pulling:" @@ -6255,13 +6705,15 @@ msgstr "" #: git-novice/_episodes/09-conflict.md:181 msgid "" "Our change is preceded by `<<<<<<< HEAD`.\n" -"Git has then inserted `=======` as a separator between the conflicting changes\n" +"Git has then inserted `=======` as a separator between the conflicting " +"changes\n" "and marked the end of the content downloaded from GitHub with `>>>>>>>`.\n" "(The string of letters and digits after that marker\n" "identifies the commit we've just downloaded.)" msgstr "" "Our change is preceded by `<<<<<<< HEAD`.\n" -"Git has then inserted `=======` as a separator between the conflicting changes\n" +"Git has then inserted `=======` as a separator between the conflicting " +"changes\n" "and marked the end of the content downloaded from GitHub with `>>>>>>>`.\n" "(The string of letters and digits after that marker\n" "identifies the commit we've just downloaded.)" @@ -6270,15 +6722,19 @@ msgstr "" msgid "" "It is now up to us to edit this file to remove these markers\n" "and reconcile the changes.\n" -"We can do anything we want: keep the change made in the local repository, keep\n" -"the change made in the remote repository, write something new to replace both,\n" +"We can do anything we want: keep the change made in the local repository, " +"keep\n" +"the change made in the remote repository, write something new to replace " +"both,\n" "or get rid of the change entirely.\n" "Let's replace both so that the file looks like this:" msgstr "" "It is now up to us to edit this file to remove these markers\n" "and reconcile the changes.\n" -"We can do anything we want: keep the change made in the local repository, keep\n" -"the change made in the remote repository, write something new to replace both,\n" +"We can do anything we want: keep the change made in the local repository, " +"keep\n" +"the change made in the remote repository, write something new to replace " +"both,\n" "or get rid of the change entirely.\n" "Let's replace both so that the file looks like this:" @@ -6449,12 +6905,14 @@ msgstr "" #: git-novice/_episodes/09-conflict.md:297 msgid "" "Git's ability to resolve conflicts is very useful, but conflict resolution\n" -"costs time and effort, and can introduce errors if conflicts are not resolved\n" +"costs time and effort, and can introduce errors if conflicts are not " +"resolved\n" "correctly. If you find yourself resolving a lot of conflicts in a project,\n" "consider these technical approaches to reducing them:" msgstr "" "Git's ability to resolve conflicts is very useful, but conflict resolution\n" -"costs time and effort, and can introduce errors if conflicts are not resolved\n" +"costs time and effort, and can introduce errors if conflicts are not " +"resolved\n" "correctly. If you find yourself resolving a lot of conflicts in a project,\n" "consider these technical approaches to reducing them:" @@ -6479,9 +6937,11 @@ msgstr "- Make smaller more atomic commits" # unordered list #: git-novice/_episodes/09-conflict.md:305 msgid "" -"- Where logically appropriate, break large files into smaller ones so that it is" +"- Where logically appropriate, break large files into smaller ones so that " +"it is" msgstr "" -"- Where logically appropriate, break large files into smaller ones so that it is" +"- Where logically appropriate, break large files into smaller ones so that " +"it is" #: git-novice/_episodes/09-conflict.md:306 msgid " less likely that two authors will alter the same file simultaneously" @@ -6499,18 +6959,22 @@ msgstr "- Clarify who is responsible for what areas with your collaborators" # unordered list #: git-novice/_episodes/09-conflict.md:311 msgid "" -"- Discuss what order tasks should be carried out in with your collaborators so" +"- Discuss what order tasks should be carried out in with your collaborators " +"so" msgstr "" -"- Discuss what order tasks should be carried out in with your collaborators so" +"- Discuss what order tasks should be carried out in with your collaborators " +"so" #: git-novice/_episodes/09-conflict.md:312 msgid "" -" that tasks expected to change the same lines won't be worked on simultaneously\n" +" that tasks expected to change the same lines won't be worked on " +"simultaneously\n" "- If the conflicts are stylistic churn (e.g. tabs vs. spaces), establish a\n" " project convention that is governing and use code style tools (e.g.\n" " `htmltidy`, `perltidy`, `rubocop`, etc.) to enforce, if necessary" msgstr "" -" that tasks expected to change the same lines won't be worked on simultaneously\n" +" that tasks expected to change the same lines won't be worked on " +"simultaneously\n" "- If the conflicts are stylistic churn (e.g. tabs vs. spaces), establish a\n" " project convention that is governing and use code style tools (e.g.\n" " `htmltidy`, `perltidy`, `rubocop`, etc.) to enforce, if necessary" @@ -6588,7 +7052,8 @@ msgid "" "> > {: .output}\n" "> >\n" "> > Suppose that Wolfman has added a similar picture in the meantime.\n" -"> > His is a picture of the Martian sky, but it is *also* called `mars.jpg`.\n" +"> > His is a picture of the Martian sky, but it is *also* called `mars." +"jpg`.\n" "> > When Dracula tries to push, he gets a familiar message:\n" "> >\n" "> > ~~~\n" @@ -6599,12 +7064,17 @@ msgid "" "> > ~~~\n" "> > To https://github.com/vlad/planets.git\n" "> > ! [rejected] master -> master (fetch first)\n" -"> > error: failed to push some refs to 'https://github.com/vlad/planets.git'\n" -"> > hint: Updates were rejected because the remote contains work that you do\n" -"> > hint: not have locally. This is usually caused by another repository pushing\n" -"> > hint: to the same ref. You may want to first integrate the remote changes\n" +"> > error: failed to push some refs to 'https://github.com/vlad/planets." +"git'\n" +"> > hint: Updates were rejected because the remote contains work that you " +"do\n" +"> > hint: not have locally. This is usually caused by another repository " +"pushing\n" +"> > hint: to the same ref. You may want to first integrate the remote " +"changes\n" "> > hint: (e.g., 'git pull ...') before pushing again.\n" -"> > hint: See the 'Note about fast-forwards' in 'git push --help' for details.\n" +"> > hint: See the 'Note about fast-forwards' in 'git push --help' for " +"details.\n" "> > ~~~\n" "> > {: .output}\n" "> >\n" @@ -6627,27 +7097,33 @@ msgid "" "> > From https://github.com/vlad/planets.git\n" "> > * branch master -> FETCH_HEAD\n" "> > 6a67967..439dc8c master -> origin/master\n" -"> > warning: Cannot merge binary files: mars.jpg (HEAD vs. 439dc8c08869c342438f6dc4a2b615b05b93c76e)\n" +"> > warning: Cannot merge binary files: mars.jpg (HEAD vs. " +"439dc8c08869c342438f6dc4a2b615b05b93c76e)\n" "> > Auto-merging mars.jpg\n" "> > CONFLICT (add/add): Merge conflict in mars.jpg\n" "> > Automatic merge failed; fix conflicts and then commit the result.\n" "> > ~~~\n" "> > {: .output}\n" "> >\n" -"> > The conflict message here is mostly the same as it was for `mars.txt`, but\n" +"> > The conflict message here is mostly the same as it was for `mars.txt`, " +"but\n" "> > there is one key additional line:\n" "> >\n" "> > ~~~\n" -"> > warning: Cannot merge binary files: mars.jpg (HEAD vs. 439dc8c08869c342438f6dc4a2b615b05b93c76e)\n" +"> > warning: Cannot merge binary files: mars.jpg (HEAD vs. " +"439dc8c08869c342438f6dc4a2b615b05b93c76e)\n" "> > ~~~\n" "> > {: .output}\n" "> >\n" -"> > Git cannot automatically insert conflict markers into an image as it does\n" -"> > for text files. So, instead of editing the image file, we must check out\n" +"> > Git cannot automatically insert conflict markers into an image as it " +"does\n" +"> > for text files. So, instead of editing the image file, we must check " +"out\n" "> > the version we want to keep. Then we can add and commit this version.\n" "> >\n" "> > On the key line above, Git has conveniently given us commit identifiers\n" -"> > for the two versions of `mars.jpg`. Our version is `HEAD`, and Wolfman's\n" +"> > for the two versions of `mars.jpg`. Our version is `HEAD`, and " +"Wolfman's\n" "> > version is `439dc8c0...`. If we want to use our version, we can use\n" "> > `git checkout`:\n" "> >\n" @@ -6663,7 +7139,8 @@ msgid "" "> > ~~~\n" "> > {: .output}\n" "> >\n" -"> > If instead we want to use Wolfman's version, we can use `git checkout` with\n" +"> > If instead we want to use Wolfman's version, we can use `git checkout` " +"with\n" "> > Wolfman's commit identifier, `439dc8c0`:\n" "> >\n" "> > ~~~\n" @@ -6755,7 +7232,8 @@ msgstr "" "> > {: .output}\n" "> >\n" "> > Suppose that ドラえもん has added a similar picture in the meantime.\n" -"> > His is a picture of the Martian sky, but it is *also* called `mars.jpg`.\n" +"> > His is a picture of the Martian sky, but it is *also* called `mars." +"jpg`.\n" "> > When のび太 tries to push, he gets a familiar message:\n" "> >\n" "> > ~~~\n" @@ -6766,12 +7244,17 @@ msgstr "" "> > ~~~\n" "> > To https://github.com/vlad/planets.git\n" "> > ! [rejected] master -> master (fetch first)\n" -"> > error: failed to push some refs to 'https://github.com/vlad/planets.git'\n" -"> > hint: Updates were rejected because the remote contains work that you do\n" -"> > hint: not have locally. This is usually caused by another repository pushing\n" -"> > hint: to the same ref. You may want to first integrate the remote changes\n" +"> > error: failed to push some refs to 'https://github.com/vlad/planets." +"git'\n" +"> > hint: Updates were rejected because the remote contains work that you " +"do\n" +"> > hint: not have locally. This is usually caused by another repository " +"pushing\n" +"> > hint: to the same ref. You may want to first integrate the remote " +"changes\n" "> > hint: (e.g., 'git pull ...') before pushing again.\n" -"> > hint: See the 'Note about fast-forwards' in 'git push --help' for details.\n" +"> > hint: See the 'Note about fast-forwards' in 'git push --help' for " +"details.\n" "> > ~~~\n" "> > {: .output}\n" "> >\n" @@ -6794,23 +7277,28 @@ msgstr "" "> > From https://github.com/vlad/planets.git\n" "> > * branch master -> FETCH_HEAD\n" "> > 6a67967..439dc8c master -> origin/master\n" -"> > warning: Cannot merge binary files: mars.jpg (HEAD vs. 439dc8c08869c342438f6dc4a2b615b05b93c76e)\n" +"> > warning: Cannot merge binary files: mars.jpg (HEAD vs. " +"439dc8c08869c342438f6dc4a2b615b05b93c76e)\n" "> > Auto-merging mars.jpg\n" "> > CONFLICT (add/add): Merge conflict in mars.jpg\n" "> > Automatic merge failed; fix conflicts and then commit the result.\n" "> > ~~~\n" "> > {: .output}\n" "> >\n" -"> > The conflict message here is mostly the same as it was for `mars.txt`, but\n" +"> > The conflict message here is mostly the same as it was for `mars.txt`, " +"but\n" "> > there is one key additional line:\n" "> >\n" "> > ~~~\n" -"> > warning: Cannot merge binary files: mars.jpg (HEAD vs. 439dc8c08869c342438f6dc4a2b615b05b93c76e)\n" +"> > warning: Cannot merge binary files: mars.jpg (HEAD vs. " +"439dc8c08869c342438f6dc4a2b615b05b93c76e)\n" "> > ~~~\n" "> > {: .output}\n" "> >\n" -"> > Git cannot automatically insert conflict markers into an image as it does\n" -"> > for text files. So, instead of editing the image file, we must check out\n" +"> > Git cannot automatically insert conflict markers into an image as it " +"does\n" +"> > for text files. So, instead of editing the image file, we must check " +"out\n" "> > the version we want to keep. Then we can add and commit this version.\n" "> >\n" "> > On the key line above, Git has conveniently given us commit identifiers\n" @@ -6831,7 +7319,8 @@ msgstr "" "> > ~~~\n" "> > {: .output}\n" "> >\n" -"> > If instead we want to use ドラえもん's version, we can use `git checkout` with\n" +"> > If instead we want to use ドラえもん's version, we can use `git " +"checkout` with\n" "> > ドラえもん's commit identifier, `439dc8c0`:\n" "> >\n" "> > ~~~\n" @@ -6888,11 +7377,13 @@ msgstr "> ## A Typical Work Session" #: git-novice/_episodes/09-conflict.md:498 msgid "" ">\n" -"> You sit down at your computer to work on a shared project that is tracked in a\n" +"> You sit down at your computer to work on a shared project that is tracked " +"in a\n" "> remote Git repository. During your work session, you take the following\n" "> actions, but not in this order:\n" ">\n" -"> - *Make changes* by appending the number `100` to a text file `numbers.txt`\n" +"> - *Make changes* by appending the number `100` to a text file `numbers." +"txt`\n" "> - *Update remote* repository to match the local repository\n" "> - *Celebrate* your success with beer(s)\n" "> - *Update local* repository to match the remote repository\n" @@ -6900,8 +7391,10 @@ msgid "" "> - *Commit changes* to the local repository\n" ">\n" "> In what order should you perform these actions to minimize the chances of\n" -"> conflicts? Put the commands above in order in the *action* column of the table\n" -"> below. When you have the order right, see if you can write the corresponding\n" +"> conflicts? Put the commands above in order in the *action* column of the " +"table\n" +"> below. When you have the order right, see if you can write the " +"corresponding\n" "> commands in the *command* column. A few steps are populated to get you\n" "> started.\n" ">\n" @@ -6916,23 +7409,32 @@ msgid "" ">\n" "> > ## Solution\n" "> >\n" -"> > |order|action . . . . . . |command . . . . . . . . . . . . . . . . . . . |\n" -"> > |-----|-------------------|----------------------------------------------|\n" -"> > |1 | Update local | `git pull origin master` |\n" -"> > |2 | Make changes | `echo 100 >> numbers.txt` |\n" -"> > |3 | Stage changes | `git add numbers.txt` |\n" +"> > |order|action . . . . . . |command . . . . . . . . . . . . . . . . . . . " +"|\n" +"> > " +"|-----|-------------------|----------------------------------------------|\n" +"> > |1 | Update local | `git pull origin master` " +"|\n" +"> > |2 | Make changes | `echo 100 >> numbers.txt` " +"|\n" +"> > |3 | Stage changes | `git add numbers.txt` " +"|\n" "> > |4 | Commit changes | `git commit -m \"Add 100 to numbers.txt" "\"` |\n" -"> > |5 | Update remote | `git push origin master` |\n" -"> > |6 | Celebrate! | `AFK` |\n" +"> > |5 | Update remote | `git push origin master` " +"|\n" +"> > |6 | Celebrate! | `AFK` " +"|\n" "> >" msgstr "" ">\n" -"> You sit down at your computer to work on a shared project that is tracked in a\n" +"> You sit down at your computer to work on a shared project that is tracked " +"in a\n" "> remote Git repository. During your work session, you take the following\n" "> actions, but not in this order:\n" ">\n" -"> - *Make changes* by appending the number `100` to a text file `numbers.txt`\n" +"> - *Make changes* by appending the number `100` to a text file `numbers." +"txt`\n" "> - *Update remote* repository to match the local repository\n" "> - *Celebrate* your success with beer(s)\n" "> - *Update local* repository to match the remote repository\n" @@ -6940,8 +7442,10 @@ msgstr "" "> - *Commit changes* to the local repository\n" ">\n" "> In what order should you perform these actions to minimize the chances of\n" -"> conflicts? Put the commands above in order in the *action* column of the table\n" -"> below. When you have the order right, see if you can write the corresponding\n" +"> conflicts? Put the commands above in order in the *action* column of the " +"table\n" +"> below. When you have the order right, see if you can write the " +"corresponding\n" "> commands in the *command* column. A few steps are populated to get you\n" "> started.\n" ">\n" @@ -6956,15 +7460,22 @@ msgstr "" ">\n" "> > ## Solution\n" "> >\n" -"> > |order|action . . . . . . |command . . . . . . . . . . . . . . . . . . . |\n" -"> > |-----|-------------------|----------------------------------------------|\n" -"> > |1 | Update local | `git pull origin master` |\n" -"> > |2 | Make changes | `echo 100 >> numbers.txt` |\n" -"> > |3 | Stage changes | `git add numbers.txt` |\n" +"> > |order|action . . . . . . |command . . . . . . . . . . . . . . . . . . . " +"|\n" +"> > " +"|-----|-------------------|----------------------------------------------|\n" +"> > |1 | Update local | `git pull origin master` " +"|\n" +"> > |2 | Make changes | `echo 100 >> numbers.txt` " +"|\n" +"> > |3 | Stage changes | `git add numbers.txt` " +"|\n" "> > |4 | Commit changes | `git commit -m \"Add 100 to numbers.txt" "\"` |\n" -"> > |5 | Update remote | `git push origin master` |\n" -"> > |6 | Celebrate! | `AFK` |\n" +"> > |5 | Update remote | `git push origin master` " +"|\n" +"> > |6 | Celebrate! | `AFK` " +"|\n" "> >" # Front Matter @@ -6977,9 +7488,11 @@ msgid "" "questions:\n" "- \"How can version control help me make my work more open?\"\n" "objectives:\n" -"- \"Explain how a version control system can be leveraged as an electronic lab notebook for computational work.\"\n" +"- \"Explain how a version control system can be leveraged as an electronic " +"lab notebook for computational work.\"\n" "keypoints:\n" -"- \"Open scientific work is more useful and more highly cited than closed.\"\n" +"- \"Open scientific work is more useful and more highly cited than closed." +"\"\n" "---" msgstr "" "---\n" @@ -7047,7 +7560,8 @@ msgid "" "but\n" " she probably doesn't include her code.\n" "* Time passes.\n" -"* The journal sends her reviews written anonymously by a handful of other people in her field.\n" +"* The journal sends her reviews written anonymously by a handful of other " +"people in her field.\n" " She revises her paper to satisfy them,\n" " during which time she might also modify the scripts she wrote earlier,\n" " and resubmits.\n" @@ -7088,7 +7602,8 @@ msgstr "" # unordered list #: git-novice/_episodes/10-open.md:48 msgid "" -"* The data that the scientist collects is stored in an open access repository" +"* The data that the scientist collects is stored in an open access " +"repository" msgstr "" "* 科学者が収集したデータは、おそらく収集されるとすぐに、" @@ -7097,7 +7612,8 @@ msgid "" " like [figshare](https://figshare.com/) or\n" " [Zenodo](https://zenodo.org), possibly as soon as it's collected,\n" " and given its own\n" -" [Digital Object Identifier](https://en.wikipedia.org/wiki/Digital_object_identifier) (DOI).\n" +" [Digital Object Identifier](https://en.wikipedia.org/wiki/" +"Digital_object_identifier) (DOI).\n" " Or the data was already published and is stored in\n" " [Dryad](https://datadryad.org/).\n" "* The scientist creates a new repository on GitHub to hold her work.\n" @@ -7122,7 +7638,8 @@ msgstr "" " [figshare](https://figshare.com/)や\n" " [Zenodo](https://zenodo.org)\n" " などのオープンアクセスリポジトリに保存され、独自の\n" -" [デジタルオブジェクト識別子](https://en.wikipedia.org/wiki/Digital_object_identifier) (DOI) が与えられます。\n" +" [デジタルオブジェクト識別子](https://en.wikipedia.org/wiki/" +"Digital_object_identifier) (DOI) が与えられます。\n" " または、データはすでに公開されており、\n" " [Dryad](https://datadryad.org/) に保存されています。\n" "* 科学者は、自分の研究を保持するためにGitHubに新しいリポジトリを作成します。\n" @@ -7142,17 +7659,23 @@ msgstr "" msgid "" "This open model accelerates discovery:\n" "the more open work is,\n" -"[the more widely it is cited and re-used](https://doi.org/10.1371/journal.pone.0000308).\n" +"[the more widely it is cited and re-used](https://doi.org/10.1371/journal." +"pone.0000308).\n" "However,\n" "people who want to work this way need to make some decisions\n" -"about what exactly \"open\" means and how to do it. You can find more on the different aspects of Open Science in [this book](https://link.springer.com/book/10.1007/978-3-319-00026-8)." +"about what exactly \"open\" means and how to do it. You can find more on the " +"different aspects of Open Science in [this book](https://link.springer.com/" +"book/10.1007/978-3-319-00026-8)." msgstr "" "このオープンモデルは発見を加速します:\n" "研究結果がオープンになっていればなっているほど、\n" -"[広く引用され、再利用されます](https://doi.org/10.1371/journal.pone.0000308)。\n" +"[広く引用され、再利用されます](https://doi.org/10.1371/journal." +"pone.0000308)。\n" "ただし、\n" "このように作業したい人は、\n" -"正確に \"オープン\" が何を意味し、それをどのように行うかについて、いくつかの決定を下す必要があります。 [この本](https://link.springer.com/book/10.1007/978-3-319-00026-8)では、オープンサイエンスのさまざまな側面について詳しく知ることができます。" +"正確に \"オープン\" が何を意味し、それをどのように行うかについて、いくつかの決定を下す必要があります。 " +"[この本](https://link.springer.com/" +"book/10.1007/978-3-319-00026-8)では、オープンサイエンスのさまざまな側面について詳しく知ることができます。" #: git-novice/_episodes/10-open.md:81 msgid "" @@ -7201,12 +7724,14 @@ msgstr "> ## コードを引用可能にすること" #: git-novice/_episodes/10-open.md:97 msgid "" ">\n" -"> Anything that is hosted in a version control repository (data, code, papers, \n" +"> Anything that is hosted in a version control repository (data, code, " +"papers, \n" "> etc.) can be turned into a citable object. You'll learn how to do this in\n" "> [lesson 12: Citation]({{ page.root }}/12-citation/)." msgstr "" ">\n" -"> バージョン管理リポジトリでホストされているもの (データ、コード、論文など) はすべて、引用可能なオブジェクトに変換できます。これを行う方法は、\n" +"> バージョン管理リポジトリでホストされているもの (データ、コード、論文など) " +"はすべて、引用可能なオブジェクトに変換できます。これを行う方法は、\n" "> [レッスン 12: 引用]({{ page.root }}/12-citation/)で学習します。" # blockquote, which can be cascaded @@ -7236,19 +7761,27 @@ msgstr "> ## 適切なデータリポジトリを見つける方法は?" #: git-novice/_episodes/10-open.md:112 msgid "" ">\n" -"> Surf the internet for a couple of minutes and check out the data repositories\n" -"> mentioned above: [Figshare](https://figshare.com/), [Zenodo](https://zenodo.org),\n" -"> [Dryad](https://datadryad.org/). Depending on your field of research, you might\n" +"> Surf the internet for a couple of minutes and check out the data " +"repositories\n" +"> mentioned above: [Figshare](https://figshare.com/), [Zenodo](https://" +"zenodo.org),\n" +"> [Dryad](https://datadryad.org/). Depending on your field of research, you " +"might\n" "> find community-recognized repositories that are well-known in your field.\n" -"> You might also find useful [these data repositories recommended by Nature](\n" +"> You might also find useful [these data repositories recommended by Nature]" +"(\n" "> https://www.nature.com/sdata/data-policies/repositories).\n" "> Discuss with your neighbor which data repository you might want to\n" "> approach for your current project and explain why." msgstr "" ">\n" -"> 数分間インターネットサーフィンして、次のデータリポジトリをチェックしてみましょう: > [Figshare](https://figshare.com/), [Zenodo](https://zenodo.org),\n" -"> [Dryad](https://datadryad.org/). 研究分野によっては、その分野でよく知られた > コミュニティで認められたリポジトリが見つかるかもしれません。\n" -"> [Natureが推奨するこれらのデータリポジトリ](https://www.nature.com/sdata/data-policies/repositories) > も便利かもしれません。\n" +"> 数分間インターネットサーフィンして、次のデータリポジトリをチェックしてみましょう: " +"> [Figshare](https://figshare.com/), [Zenodo](https://" +"zenodo.org),\n" +"> [Dryad](https://datadryad.org/). 研究分野によっては、その分野でよく知られた " +"> コミュニティで認められたリポジトリが見つかるかもしれません。\n" +"> [Natureが推奨するこれらのデータリポジトリ](https://www.nature.com/sdata/data-policies/repositories) " +"> も便利かもしれません。\n" "> 現在のプロジェクト用にどのデータリポジトリにアプローチしたいかを隣人と議論し、その理由を説明してみましょう。" # Front Matter @@ -7261,13 +7794,19 @@ msgid "" "questions:\n" "- \"What licensing information should I include with my work?\"\n" "objectives:\n" -"- \"Explain why adding licensing information to a repository is important.\"\n" +"- \"Explain why adding licensing information to a repository is important." +"\"\n" "- \"Choose a proper license.\"\n" "- \"Explain differences in licensing and social expectations.\"\n" "keypoints:\n" -"- \"People who incorporate General Public License (GPL'd) software into their own software must make their software also open under the GPL license; most other open licenses do not require this.\"\n" -"- \"The Creative Commons family of licenses allow people to mix and match requirements and restrictions on attribution, creation of derivative works, further sharing, and commercialization.\"\n" -"- \"People who are not lawyers should not try to write licenses from scratch.\"\n" +"- \"People who incorporate General Public License (GPL'd) software into " +"their own software must make their software also open under the GPL license; " +"most other open licenses do not require this.\"\n" +"- \"The Creative Commons family of licenses allow people to mix and match " +"requirements and restrictions on attribution, creation of derivative works, " +"further sharing, and commercialization.\"\n" +"- \"People who are not lawyers should not try to write licenses from scratch." +"\"\n" "---" msgstr "" "---\n" @@ -7277,13 +7816,19 @@ msgstr "" "questions:\n" "- \"What licensing information should I include with my work?\"\n" "objectives:\n" -"- \"Explain why adding licensing information to a repository is important.\"\n" +"- \"Explain why adding licensing information to a repository is important." +"\"\n" "- \"Choose a proper license.\"\n" "- \"Explain differences in licensing and social expectations.\"\n" "keypoints:\n" -"- \"People who incorporate General Public License (GPL'd) software into their own software must make their software also open under the GPL license; most other open licenses do not require this.\"\n" -"- \"The Creative Commons family of licenses allow people to mix and match requirements and restrictions on attribution, creation of derivative works, further sharing, and commercialization.\"\n" -"- \"People who are not lawyers should not try to write licenses from scratch.\"\n" +"- \"People who incorporate General Public License (GPL'd) software into " +"their own software must make their software also open under the GPL license; " +"most other open licenses do not require this.\"\n" +"- \"The Creative Commons family of licenses allow people to mix and match " +"requirements and restrictions on attribution, creation of derivative works, " +"further sharing, and commercialization.\"\n" +"- \"People who are not lawyers should not try to write licenses from scratch." +"\"\n" "---" #: git-novice/_episodes/11-licensing.md:17 @@ -7364,11 +7909,13 @@ msgstr "" #: git-novice/_episodes/11-licensing.md:48 msgid "" -"[This article](https://doi.org/10.1371/journal.pcbi.1002598) provides an excellent overview of\n" +"[This article](https://doi.org/10.1371/journal.pcbi.1002598) provides an " +"excellent overview of\n" "licensing and licensing options from the perspective of scientists who\n" "also write code." msgstr "" -"[This article](https://doi.org/10.1371/journal.pcbi.1002598) provides an excellent overview of\n" +"[This article](https://doi.org/10.1371/journal.pcbi.1002598) provides an " +"excellent overview of\n" "licensing and licensing options from the perspective of scientists who\n" "also write code." @@ -7396,13 +7943,15 @@ msgstr "> ## Can I Use Open License?" #: git-novice/_episodes/11-licensing.md:60 msgid "" ">\n" -"> Find out whether you are allowed to apply an open license to your software.\n" +"> Find out whether you are allowed to apply an open license to your " +"software.\n" "> Can you do this unilaterally,\n" "> or do you need permission from someone in your institution?\n" "> If so, who?" msgstr "" ">\n" -"> Find out whether you are allowed to apply an open license to your software.\n" +"> Find out whether you are allowed to apply an open license to your " +"software.\n" "> Can you do this unilaterally,\n" "> or do you need permission from someone in your institution?\n" "> If so, who?" @@ -7415,26 +7964,40 @@ msgstr "> ## What licenses have I already accepted?" #: git-novice/_episodes/11-licensing.md:68 msgid "" ">\n" -"> Many of the software tools we use on a daily basis (including in this workshop) are\n" -"> released as open-source software. Pick a project on GitHub from the list below, or\n" -"> one of your own choosing. Find its license (usually in a file called `LICENSE` or\n" -"> `COPYING`) and talk about how it restricts your use of the software. Is it one of\n" +"> Many of the software tools we use on a daily basis (including in this " +"workshop) are\n" +"> released as open-source software. Pick a project on GitHub from the list " +"below, or\n" +"> one of your own choosing. Find its license (usually in a file called " +"`LICENSE` or\n" +"> `COPYING`) and talk about how it restricts your use of the software. Is it " +"one of\n" "> the licenses discussed in this session? How is it different?\n" "> - [Git](https://github.com/git/git), the source-code management tool\n" -"> - [CPython](https://github.com/python/cpython), the standard implementation of the Python language\n" -"> - [Jupyter](https://github.com/jupyter), the project behind the web-based Python notebooks we'll be using\n" -"> - [EtherPad](https://github.com/ether/etherpad-lite), a real-time collaborative editor" -msgstr "" -">\n" -"> Many of the software tools we use on a daily basis (including in this workshop) are\n" -"> released as open-source software. Pick a project on GitHub from the list below, or\n" -"> one of your own choosing. Find its license (usually in a file called `LICENSE` or\n" -"> `COPYING`) and talk about how it restricts your use of the software. Is it one of\n" +"> - [CPython](https://github.com/python/cpython), the standard " +"implementation of the Python language\n" +"> - [Jupyter](https://github.com/jupyter), the project behind the web-based " +"Python notebooks we'll be using\n" +"> - [EtherPad](https://github.com/ether/etherpad-lite), a real-time " +"collaborative editor" +msgstr "" +">\n" +"> Many of the software tools we use on a daily basis (including in this " +"workshop) are\n" +"> released as open-source software. Pick a project on GitHub from the list " +"below, or\n" +"> one of your own choosing. Find its license (usually in a file called " +"`LICENSE` or\n" +"> `COPYING`) and talk about how it restricts your use of the software. Is it " +"one of\n" "> the licenses discussed in this session? How is it different?\n" "> - [Git](https://github.com/git/git), the source-code management tool\n" -"> - [CPython](https://github.com/python/cpython), the standard implementation of the Python language\n" -"> - [Jupyter](https://github.com/jupyter), the project behind the web-based Python notebooks we'll be using\n" -"> - [EtherPad](https://github.com/ether/etherpad-lite), a real-time collaborative editor" +"> - [CPython](https://github.com/python/cpython), the standard " +"implementation of the Python language\n" +"> - [Jupyter](https://github.com/jupyter), the project behind the web-based " +"Python notebooks we'll be using\n" +"> - [EtherPad](https://github.com/ether/etherpad-lite), a real-time " +"collaborative editor" # Front Matter #: git-novice/_episodes/12-citation.md:1 @@ -7448,7 +8011,8 @@ msgid "" "objectives:\n" "- \"Make your work easy to cite\"\n" "keypoints:\n" -"- \"Add a CITATION file to a repository to explain how you want your work cited.\"\n" +"- \"Add a CITATION file to a repository to explain how you want your work " +"cited.\"\n" "---" msgstr "" "---\n" @@ -7460,7 +8024,8 @@ msgstr "" "objectives:\n" "- \"Make your work easy to cite\"\n" "keypoints:\n" -"- \"Add a CITATION file to a repository to explain how you want your work cited.\"\n" +"- \"Add a CITATION file to a repository to explain how you want your work " +"cited.\"\n" "---" #: git-novice/_episodes/12-citation.md:13 @@ -7481,7 +8046,8 @@ msgstr "" #: git-novice/_episodes/12-citation.md:19 msgid "" "~~~\n" -"To reference Software Carpentry in publications, please cite both of the following:\n" +"To reference Software Carpentry in publications, please cite both of the " +"following:\n" "\n" "Greg Wilson: \"Software Carpentry: Getting Scientists to Write Better\n" "Code by Making Them More Productive\". Computing in Science &\n" @@ -7492,7 +8058,8 @@ msgid "" "\n" "@article{wilson-software-carpentry-2006,\n" " author = {Greg Wilson},\n" -" title = {Software Carpentry: Getting Scientists to Write Better Code by Making Them More Productive},\n" +" title = {Software Carpentry: Getting Scientists to Write Better Code " +"by Making Them More Productive},\n" " journal = {Computing in Science \\& Engineering},\n" " month = {November--December},\n" " year = {2006},\n" @@ -7509,7 +8076,8 @@ msgid "" "~~~" msgstr "" "~~~\n" -"To reference Software Carpentry in publications, please cite both of the following:\n" +"To reference Software Carpentry in publications, please cite both of the " +"following:\n" "\n" "Greg Wilson: \"Software Carpentry: Getting Scientists to Write Better\n" "Code by Making Them More Productive\". Computing in Science &\n" @@ -7520,7 +8088,8 @@ msgstr "" "\n" "@article{wilson-software-carpentry-2006,\n" " author = {Greg Wilson},\n" -" title = {Software Carpentry: Getting Scientists to Write Better Code by Making Them More Productive},\n" +" title = {Software Carpentry: Getting Scientists to Write Better Code " +"by Making Them More Productive},\n" " journal = {Computing in Science \\& Engineering},\n" " month = {November--December},\n" " year = {2006},\n" @@ -7544,10 +8113,12 @@ msgstr "{: .source}" #: git-novice/_episodes/12-citation.md:48 msgid "" "More detailed advice, and other ways to make your code citable can be found\n" -"[at the Software Sustainability Institute blog](https://www.software.ac.uk/how-cite-and-describe-software) and in:" +"[at the Software Sustainability Institute blog](https://www.software.ac.uk/" +"how-cite-and-describe-software) and in:" msgstr "" "More detailed advice, and other ways to make your code citable can be found\n" -"[at the Software Sustainability Institute blog](https://www.software.ac.uk/how-cite-and-describe-software) and in:" +"[at the Software Sustainability Institute blog](https://www.software.ac.uk/" +"how-cite-and-describe-software) and in:" # blockquote, which can be cascaded #: git-novice/_episodes/12-citation.md:51 @@ -7559,22 +8130,26 @@ msgstr "" # blockquote, which can be cascaded #: git-novice/_episodes/12-citation.md:52 msgid "" -"> (2016) Software citation principles. [PeerJ Computer Science 2:e86](https://peerj.com/articles/cs-86/) https://doi.org/10.7717/peerj-cs.86" +"> (2016) Software citation principles. [PeerJ Computer Science 2:e86]" +"(https://peerj.com/articles/cs-86/) https://doi.org/10.7717/peerj-cs.86" msgstr "" -"> (2016) Software citation principles. [PeerJ Computer Science 2:e86](https://peerj.com/articles/cs-86/) https://doi.org/10.7717/peerj-cs.86" +"> (2016) Software citation principles. [PeerJ Computer Science 2:e86]" +"(https://peerj.com/articles/cs-86/) https://doi.org/10.7717/peerj-cs.86" #: git-novice/_episodes/12-citation.md:54 msgid "" "There is also an [`@software{…`](https://www.google.de/search?q=git+citation+" "%22%40software%7B%22) \n" "[BibTeX](https://www.ctan.org/pkg/bibtex) entry type in case\n" -"no \"umbrella\" citation like a paper or book exists for the project you want to\n" +"no \"umbrella\" citation like a paper or book exists for the project you " +"want to\n" "make citable." msgstr "" "There is also an [`@software{…`](https://www.google.de/search?q=git+citation+" "%22%40software%7B%22) \n" "[BibTeX](https://www.ctan.org/pkg/bibtex) entry type in case\n" -"no \"umbrella\" citation like a paper or book exists for the project you want to\n" +"no \"umbrella\" citation like a paper or book exists for the project you " +"want to\n" "make citable." # Front Matter @@ -7589,8 +8164,10 @@ msgid "" "objectives:\n" "- \"Explain different options for hosting scientific work.\"\n" "keypoints:\n" -"- \"Projects can be hosted on university servers, on personal domains, or on public forges.\"\n" -"- \"Rules regarding intellectual property and storage of sensitive information apply no matter where code and data are hosted.\"\n" +"- \"Projects can be hosted on university servers, on personal domains, or on " +"public forges.\"\n" +"- \"Rules regarding intellectual property and storage of sensitive " +"information apply no matter where code and data are hosted.\"\n" "---" msgstr "" "---\n" @@ -7602,46 +8179,66 @@ msgstr "" "objectives:\n" "- \"Explain different options for hosting scientific work.\"\n" "keypoints:\n" -"- \"Projects can be hosted on university servers, on personal domains, or on public forges.\"\n" -"- \"Rules regarding intellectual property and storage of sensitive information apply no matter where code and data are hosted.\"\n" +"- \"Projects can be hosted on university servers, on personal domains, or on " +"public forges.\"\n" +"- \"Rules regarding intellectual property and storage of sensitive " +"information apply no matter where code and data are hosted.\"\n" "---" #: git-novice/_episodes/13-hosting.md:14 msgid "" -"The second big question for groups that want to open up their work is where to\n" -"host their code and data. One option is for the lab, the department, or the\n" -"university to provide a server, manage accounts and backups, and so on. The\n" -"main benefit of this is that it clarifies who owns what, which is particularly\n" +"The second big question for groups that want to open up their work is where " +"to\n" +"host their code and data. One option is for the lab, the department, or " +"the\n" +"university to provide a server, manage accounts and backups, and so on. " +"The\n" +"main benefit of this is that it clarifies who owns what, which is " +"particularly\n" "important if any of the material is sensitive (i.e., relates to experiments\n" "involving human subjects or may be used in a patent application). The main\n" -"drawbacks are the cost of providing the service and its longevity: a scientist\n" -"who has spent ten years collecting data would like to be sure that data will\n" -"still be available ten years from now, but that's well beyond the lifespan of\n" +"drawbacks are the cost of providing the service and its longevity: a " +"scientist\n" +"who has spent ten years collecting data would like to be sure that data " +"will\n" +"still be available ten years from now, but that's well beyond the lifespan " +"of\n" "most of the grants that fund academic infrastructure." msgstr "" -"The second big question for groups that want to open up their work is where to\n" -"host their code and data. One option is for the lab, the department, or the\n" -"university to provide a server, manage accounts and backups, and so on. The\n" -"main benefit of this is that it clarifies who owns what, which is particularly\n" +"The second big question for groups that want to open up their work is where " +"to\n" +"host their code and data. One option is for the lab, the department, or " +"the\n" +"university to provide a server, manage accounts and backups, and so on. " +"The\n" +"main benefit of this is that it clarifies who owns what, which is " +"particularly\n" "important if any of the material is sensitive (i.e., relates to experiments\n" "involving human subjects or may be used in a patent application). The main\n" -"drawbacks are the cost of providing the service and its longevity: a scientist\n" -"who has spent ten years collecting data would like to be sure that data will\n" -"still be available ten years from now, but that's well beyond the lifespan of\n" +"drawbacks are the cost of providing the service and its longevity: a " +"scientist\n" +"who has spent ten years collecting data would like to be sure that data " +"will\n" +"still be available ten years from now, but that's well beyond the lifespan " +"of\n" "most of the grants that fund academic infrastructure." #: git-novice/_episodes/13-hosting.md:25 msgid "" "Another option is to purchase a domain and pay an Internet service provider\n" "(ISP) to host it. This gives the individual or group more control, and\n" -"sidesteps problems that can arise when moving from one institution to another,\n" -"but requires more time and effort to set up than either the option above or the\n" +"sidesteps problems that can arise when moving from one institution to " +"another,\n" +"but requires more time and effort to set up than either the option above or " +"the\n" "option below." msgstr "" "Another option is to purchase a domain and pay an Internet service provider\n" "(ISP) to host it. This gives the individual or group more control, and\n" -"sidesteps problems that can arise when moving from one institution to another,\n" -"but requires more time and effort to set up than either the option above or the\n" +"sidesteps problems that can arise when moving from one institution to " +"another,\n" +"but requires more time and effort to set up than either the option above or " +"the\n" "option below." #: git-novice/_episodes/13-hosting.md:31 @@ -7649,11 +8246,15 @@ msgid "" "The third option is to use a public hosting service like\n" "[GitHub](https://github.com), [GitLab](https://gitlab.com),or\n" "[BitBucket](https://bitbucket.org).\n" -"Each of these services provides a web interface that enables people to create,\n" +"Each of these services provides a web interface that enables people to " +"create,\n" "view, and edit their code repositories. These services also provide\n" -"communication and project management tools including issue tracking, wiki pages,\n" -"email notifications, and code reviews. These services benefit from economies of\n" -"scale and network effects: it's easier to run one large service well than to run\n" +"communication and project management tools including issue tracking, wiki " +"pages,\n" +"email notifications, and code reviews. These services benefit from " +"economies of\n" +"scale and network effects: it's easier to run one large service well than to " +"run\n" "many smaller services to the same standard. It's also easier for people to\n" "collaborate. Using a popular service can help connect your project with\n" "communities already using the same service." @@ -7661,11 +8262,15 @@ msgstr "" "The third option is to use a public hosting service like\n" "[GitHub](https://github.com), [GitLab](https://gitlab.com),or\n" "[BitBucket](https://bitbucket.org).\n" -"Each of these services provides a web interface that enables people to create,\n" +"Each of these services provides a web interface that enables people to " +"create,\n" "view, and edit their code repositories. These services also provide\n" -"communication and project management tools including issue tracking, wiki pages,\n" -"email notifications, and code reviews. These services benefit from economies of\n" -"scale and network effects: it's easier to run one large service well than to run\n" +"communication and project management tools including issue tracking, wiki " +"pages,\n" +"email notifications, and code reviews. These services benefit from " +"economies of\n" +"scale and network effects: it's easier to run one large service well than to " +"run\n" "many smaller services to the same standard. It's also easier for people to\n" "collaborate. Using a popular service can help connect your project with\n" "communities already using the same service." @@ -7684,25 +8289,39 @@ msgstr "" #: git-novice/_episodes/13-hosting.md:48 msgid "" -"Using large, well-established services can also help you quickly take advantage\n" +"Using large, well-established services can also help you quickly take " +"advantage\n" "of powerful tools. One such tool, continuous integration (CI), can\n" -"automatically run software builds and tests whenever code is committed or pull\n" -"requests are submitted. Direct integration of CI with an online hosting service\n" -"means this information is present in any pull request, and helps maintain code\n" -"integrity and quality standards. While CI is still available in self-hosted\n" +"automatically run software builds and tests whenever code is committed or " +"pull\n" +"requests are submitted. Direct integration of CI with an online hosting " +"service\n" +"means this information is present in any pull request, and helps maintain " +"code\n" +"integrity and quality standards. While CI is still available in self-" +"hosted\n" "situations, there is much less setup and maintenance involved with using an\n" -"online service. Furthermore, such tools are often provided free of charge to\n" -"open source projects, and are also available for private repositories for a fee." +"online service. Furthermore, such tools are often provided free of charge " +"to\n" +"open source projects, and are also available for private repositories for a " +"fee." msgstr "" -"Using large, well-established services can also help you quickly take advantage\n" +"Using large, well-established services can also help you quickly take " +"advantage\n" "of powerful tools. One such tool, continuous integration (CI), can\n" -"automatically run software builds and tests whenever code is committed or pull\n" -"requests are submitted. Direct integration of CI with an online hosting service\n" -"means this information is present in any pull request, and helps maintain code\n" -"integrity and quality standards. While CI is still available in self-hosted\n" +"automatically run software builds and tests whenever code is committed or " +"pull\n" +"requests are submitted. Direct integration of CI with an online hosting " +"service\n" +"means this information is present in any pull request, and helps maintain " +"code\n" +"integrity and quality standards. While CI is still available in self-" +"hosted\n" "situations, there is much less setup and maintenance involved with using an\n" -"online service. Furthermore, such tools are often provided free of charge to\n" -"open source projects, and are also available for private repositories for a fee." +"online service. Furthermore, such tools are often provided free of charge " +"to\n" +"open source projects, and are also available for private repositories for a " +"fee." # blockquote, which can be cascaded #: git-novice/_episodes/13-hosting.md:58 @@ -7718,7 +8337,8 @@ msgid "" "> If you encounter such restrictions,\n" "> it can be productive to inquire about the underlying motivations and\n" "> either to request an exception for a specific project or domain,\n" -"> or to push more broadly for institutional reform to support more open science." +"> or to push more broadly for institutional reform to support more open " +"science." msgstr "" ">\n" "> Sharing is the ideal for science,\n" @@ -7727,7 +8347,8 @@ msgstr "" "> If you encounter such restrictions,\n" "> it can be productive to inquire about the underlying motivations and\n" "> either to request an exception for a specific project or domain,\n" -"> or to push more broadly for institutional reform to support more open science." +"> or to push more broadly for institutional reform to support more open " +"science." # blockquote, which can be cascaded #: git-novice/_episodes/13-hosting.md:69 @@ -7737,13 +8358,15 @@ msgstr "> ## Can My Work Be Public?" #: git-novice/_episodes/13-hosting.md:70 msgid "" ">\n" -"> Find out whether you are allowed to host your work openly on a public forge.\n" +"> Find out whether you are allowed to host your work openly on a public " +"forge.\n" "> Can you do this unilaterally,\n" "> or do you need permission from someone in your institution?\n" "> If so, who?" msgstr "" ">\n" -"> Find out whether you are allowed to host your work openly on a public forge.\n" +"> Find out whether you are allowed to host your work openly on a public " +"forge.\n" "> Can you do this unilaterally,\n" "> or do you need permission from someone in your institution?\n" "> If so, who?" @@ -7757,13 +8380,19 @@ msgstr "> ## Where Can I Share My Work?" msgid "" ">\n" "> Does your institution have a repository or repositories that you can\n" -"> use to share your papers, data and software? How do institutional repositories\n" -"> differ from services like [arXiV](https://arxiv.org/), [figshare](https://figshare.com/), [GitHub](https://github.com/) or [GitLab](https://about.gitlab.com/)?" +"> use to share your papers, data and software? How do institutional " +"repositories\n" +"> differ from services like [arXiV](https://arxiv.org/), [figshare](https://" +"figshare.com/), [GitHub](https://github.com/) or [GitLab](https://about." +"gitlab.com/)?" msgstr "" ">\n" "> Does your institution have a repository or repositories that you can\n" -"> use to share your papers, data and software? How do institutional repositories\n" -"> differ from services like [arXiV](https://arxiv.org/), [figshare](https://figshare.com/), [GitHub](https://github.com/) or [GitLab](https://about.gitlab.com/)?" +"> use to share your papers, data and software? How do institutional " +"repositories\n" +"> differ from services like [arXiV](https://arxiv.org/), [figshare](https://" +"figshare.com/), [GitHub](https://github.com/) or [GitLab](https://about." +"gitlab.com/)?" # Front Matter #: git-novice/_episodes/14-supplemental-rstudio.md:1 @@ -7794,13 +8423,15 @@ msgstr "" #: git-novice/_episodes/14-supplemental-rstudio.md:13 msgid "" -"Version control can be very useful when developing data analysis scripts. For\n" +"Version control can be very useful when developing data analysis scripts. " +"For\n" "that reason, the popular development environment\n" "RStudio for the R programming language has built-in\n" "integration with Git. While some advanced Git features still require the\n" "command-line, RStudio has a nice interface for many common Git operations." msgstr "" -"Version control can be very useful when developing data analysis scripts. For\n" +"Version control can be very useful when developing data analysis scripts. " +"For\n" "that reason, the popular development environment\n" "RStudio for the R programming language has built-in\n" "integration with Git. While some advanced Git features still require the\n" @@ -7809,16 +8440,20 @@ msgstr "" #: git-novice/_episodes/14-supplemental-rstudio.md:19 msgid "" "RStudio allows us to create a [project][rstudio-projects] associated with a\n" -"given directory to keep track of various related files. To be able to track the\n" +"given directory to keep track of various related files. To be able to track " +"the\n" "development of the project over time, to be able to revert to previous\n" "versions, and to collaborate with others, we version control the Rstudio\n" -"project with Git. To get started using Git in RStudio, we create a new project:" +"project with Git. To get started using Git in RStudio, we create a new " +"project:" msgstr "" "RStudio allows us to create a [project][rstudio-projects] associated with a\n" -"given directory to keep track of various related files. To be able to track the\n" +"given directory to keep track of various related files. To be able to track " +"the\n" "development of the project over time, to be able to revert to previous\n" "versions, and to collaborate with others, we version control the Rstudio\n" -"project with Git. To get started using Git in RStudio, we create a new project:" +"project with Git. To get started using Git in RStudio, we create a new " +"project:" #: git-novice/_episodes/14-supplemental-rstudio.md:25 msgid "![](../fig/RStudio_screenshot_newproject.png)" @@ -7826,14 +8461,18 @@ msgstr "![](../fig/RStudio_screenshot_newproject.png)" #: git-novice/_episodes/14-supplemental-rstudio.md:27 msgid "" -"This will open a dialog asking us how we want to create the project. We have\n" +"This will open a dialog asking us how we want to create the project. We " +"have\n" "some options here. Let's say that we want to use RStudio with the planets\n" -"repository that we already made. Since that repository lives in a directory on\n" +"repository that we already made. Since that repository lives in a directory " +"on\n" "our computer, we choose the option \"Existing Directory\":" msgstr "" -"This will open a dialog asking us how we want to create the project. We have\n" +"This will open a dialog asking us how we want to create the project. We " +"have\n" "some options here. Let's say that we want to use RStudio with the planets\n" -"repository that we already made. Since that repository lives in a directory on\n" +"repository that we already made. Since that repository lives in a directory " +"on\n" "our computer, we choose the option \"Existing Directory\":" #: git-novice/_episodes/14-supplemental-rstudio.md:32 @@ -7848,20 +8487,24 @@ msgstr "> ## Do You See a \"Version Control\" Option?" #: git-novice/_episodes/14-supplemental-rstudio.md:35 msgid "" ">\n" -"> Although we're not going to use it here, there should be a \"version control\"\n" +"> Although we're not going to use it here, there should be a \"version " +"control\"\n" "> option on this menu. That is what you would click on if you wanted to\n" "> create a project on your computer by cloning a repository from GitHub.\n" -"> If that option is not present, it probably means that RStudio doesn't know\n" +"> If that option is not present, it probably means that RStudio doesn't " +"know\n" "> where your Git executable is. See\n" "> [this page](https://stat545-ubc.github.io/git03_rstudio-meet-git.html)\n" "> for some debugging advice. Even if you have Git installed, you may need\n" "> to accept the XCode license if you are using macOS." msgstr "" ">\n" -"> Although we're not going to use it here, there should be a \"version control\"\n" +"> Although we're not going to use it here, there should be a \"version " +"control\"\n" "> option on this menu. That is what you would click on if you wanted to\n" "> create a project on your computer by cloning a repository from GitHub.\n" -"> If that option is not present, it probably means that RStudio doesn't know\n" +"> If that option is not present, it probably means that RStudio doesn't " +"know\n" "> where your Git executable is. See\n" "> [this page](https://stat545-ubc.github.io/git03_rstudio-meet-git.html)\n" "> for some debugging advice. Even if you have Git installed, you may need\n" @@ -7870,10 +8513,12 @@ msgstr "" #: git-novice/_episodes/14-supplemental-rstudio.md:46 msgid "" "Next, RStudio will ask which existing directory we want to use. Click\n" -"\"Browse...\" and navigate to the correct directory, then click \"Create Project\":" +"\"Browse...\" and navigate to the correct directory, then click \"Create " +"Project\":" msgstr "" "Next, RStudio will ask which existing directory we want to use. Click\n" -"\"Browse...\" and navigate to the correct directory, then click \"Create Project\":" +"\"Browse...\" and navigate to the correct directory, then click \"Create " +"Project\":" #: git-novice/_episodes/14-supplemental-rstudio.md:49 msgid "![](../fig/RStudio_screenshot_navigateexisting.png)" @@ -7898,11 +8543,13 @@ msgstr "![](../fig/RStudio_screenshot_afterclone.png)" #: git-novice/_episodes/14-supplemental-rstudio.md:58 msgid "" "To edit the existing files in the repository, we can click on them in the\n" -"\"Files\" panel on the lower right. Now let's add some additional information\n" +"\"Files\" panel on the lower right. Now let's add some additional " +"information\n" "about Pluto:" msgstr "" "To edit the existing files in the repository, we can click on them in the\n" -"\"Files\" panel on the lower right. Now let's add some additional information\n" +"\"Files\" panel on the lower right. Now let's add some additional " +"information\n" "about Pluto:" #: git-novice/_episodes/14-supplemental-rstudio.md:62 @@ -7911,10 +8558,12 @@ msgstr "![](../fig/RStudio_screenshot_editfiles.png)" #: git-novice/_episodes/14-supplemental-rstudio.md:64 msgid "" -"Once we have saved our edited files, we can use RStudio to commit the changes\n" +"Once we have saved our edited files, we can use RStudio to commit the " +"changes\n" "by clicking on \"Commit...\" in the Git menu:" msgstr "" -"Once we have saved our edited files, we can use RStudio to commit the changes\n" +"Once we have saved our edited files, we can use RStudio to commit the " +"changes\n" "by clicking on \"Commit...\" in the Git menu:" #: git-novice/_episodes/14-supplemental-rstudio.md:67 @@ -7924,17 +8573,23 @@ msgstr "![](../fig/RStudio_screenshot_commit.png)" #: git-novice/_episodes/14-supplemental-rstudio.md:69 msgid "" "This will open a dialogue where we can select which files to commit (by\n" -"checking the appropriate boxes in the \"Staged\" column), and enter a commit\n" -"message (in the upper right panel). The icons in the \"Status\" column indicate\n" +"checking the appropriate boxes in the \"Staged\" column), and enter a " +"commit\n" +"message (in the upper right panel). The icons in the \"Status\" column " +"indicate\n" "the current status of each file. Clicking on a file shows information about\n" -"changes in the lower panel (using output of `git diff`). Once everything is the\n" +"changes in the lower panel (using output of `git diff`). Once everything is " +"the\n" "way we want it, we click \"Commit\":" msgstr "" "This will open a dialogue where we can select which files to commit (by\n" -"checking the appropriate boxes in the \"Staged\" column), and enter a commit\n" -"message (in the upper right panel). The icons in the \"Status\" column indicate\n" +"checking the appropriate boxes in the \"Staged\" column), and enter a " +"commit\n" +"message (in the upper right panel). The icons in the \"Status\" column " +"indicate\n" "the current status of each file. Clicking on a file shows information about\n" -"changes in the lower panel (using output of `git diff`). Once everything is the\n" +"changes in the lower panel (using output of `git diff`). Once everything is " +"the\n" "way we want it, we click \"Commit\":" #: git-novice/_episodes/14-supplemental-rstudio.md:76 @@ -7943,11 +8598,13 @@ msgstr "![](../fig/RStudio_screenshot_review.png)" #: git-novice/_episodes/14-supplemental-rstudio.md:78 msgid "" -"The changes can be pushed by selecting \"Push Branch\" from the Git menu. There\n" +"The changes can be pushed by selecting \"Push Branch\" from the Git menu. " +"There\n" "are also options to pull from the remote repository, and to view the commit\n" "history:" msgstr "" -"The changes can be pushed by selecting \"Push Branch\" from the Git menu. There\n" +"The changes can be pushed by selecting \"Push Branch\" from the Git menu. " +"There\n" "are also options to pull from the remote repository, and to view the commit\n" "history:" @@ -7963,23 +8620,27 @@ msgstr "> ## Are the Push/Pull Commands Grayed Out?" #: git-novice/_episodes/14-supplemental-rstudio.md:85 msgid "" ">\n" -"> Grayed out Push/Pull commands generally mean that RStudio doesn't know the\n" +"> Grayed out Push/Pull commands generally mean that RStudio doesn't know " +"the\n" "> location of your remote repository (e.g. on GitHub). To fix this, open a\n" "> terminal to the repository and enter the command: `git push -u origin\n" "> master`. Then restart RStudio." msgstr "" ">\n" -"> Grayed out Push/Pull commands generally mean that RStudio doesn't know the\n" +"> Grayed out Push/Pull commands generally mean that RStudio doesn't know " +"the\n" "> location of your remote repository (e.g. on GitHub). To fix this, open a\n" "> terminal to the repository and enter the command: `git push -u origin\n" "> master`. Then restart RStudio." #: git-novice/_episodes/14-supplemental-rstudio.md:92 msgid "" -"If we click on \"History\", we can see a graphical version of what `git log`\n" +"If we click on \"History\", we can see a graphical version of what `git " +"log`\n" "would tell us:" msgstr "" -"If we click on \"History\", we can see a graphical version of what `git log`\n" +"If we click on \"History\", we can see a graphical version of what `git " +"log`\n" "would tell us:" #: git-novice/_episodes/14-supplemental-rstudio.md:95 @@ -7988,12 +8649,16 @@ msgstr "![](../fig/RStudio_screenshot_viewhistory.png)" #: git-novice/_episodes/14-supplemental-rstudio.md:97 msgid "" -"RStudio creates a number of files that it uses to keep track of a project. We\n" -"often don't want to track these, in which case we add them to our `.gitignore`\n" +"RStudio creates a number of files that it uses to keep track of a project. " +"We\n" +"often don't want to track these, in which case we add them to our `." +"gitignore`\n" "file:" msgstr "" -"RStudio creates a number of files that it uses to keep track of a project. We\n" -"often don't want to track these, in which case we add them to our `.gitignore`\n" +"RStudio creates a number of files that it uses to keep track of a project. " +"We\n" +"often don't want to track these, in which case we add them to our `." +"gitignore`\n" "file:" #: git-novice/_episodes/14-supplemental-rstudio.md:101 @@ -8008,13 +8673,17 @@ msgstr "> ## Tip: versioning disposable output" #: git-novice/_episodes/14-supplemental-rstudio.md:104 msgid "" ">\n" -"> Generally you do not want to version control disposable output (or read-only\n" -"> data). You should modify the `.gitignore` file to tell Git to ignore these\n" +"> Generally you do not want to version control disposable output (or read-" +"only\n" +"> data). You should modify the `.gitignore` file to tell Git to ignore " +"these\n" "> files and directories." msgstr "" ">\n" -"> Generally you do not want to version control disposable output (or read-only\n" -"> data). You should modify the `.gitignore` file to tell Git to ignore these\n" +"> Generally you do not want to version control disposable output (or read-" +"only\n" +"> data). You should modify the `.gitignore` file to tell Git to ignore " +"these\n" "> files and directories." # blockquote, which can be cascaded @@ -8026,7 +8695,8 @@ msgstr "> ## Challenge" msgid "" ">\n" "> 1. Create a new directory within your project called `graphs`.\n" -"> 2. Modify the `.gitignore` so that the `graphs` directory is not version controlled.\n" +"> 2. Modify the `.gitignore` so that the `graphs` directory is not version " +"controlled.\n" ">\n" "> Add the newly created folders to version control using\n" "> the Git interface.\n" @@ -8042,7 +8712,8 @@ msgid "" msgstr "" ">\n" "> 1. Create a new directory within your project called `graphs`.\n" -"> 2. Modify the `.gitignore` so that the `graphs` directory is not version controlled.\n" +"> 2. Modify the `.gitignore` so that the `graphs` directory is not version " +"controlled.\n" ">\n" "> Add the newly created folders to version control using\n" "> the Git interface.\n" @@ -8066,9 +8737,11 @@ msgstr "" #: git-novice/_episodes/14-supplemental-rstudio.md:132 msgid "" -"[rstudio-projects]: https://support.rstudio.com/hc/en-us/articles/200526207-Using-Projects" +"[rstudio-projects]: https://support.rstudio.com/hc/en-us/articles/200526207-" +"Using-Projects" msgstr "" -"[rstudio-projects]: https://support.rstudio.com/hc/en-us/articles/200526207-Using-Projects" +"[rstudio-projects]: https://support.rstudio.com/hc/en-us/articles/200526207-" +"Using-Projects" # Front Matter #: git-novice/_extras/about.md:1 @@ -8111,17 +8784,23 @@ msgstr "## Frequently Asked Questions" #: git-novice/_extras/discuss.md:9 msgid "" -"People often have questions about Git beyond the scope of the core material.\n" -"Students who have completed the rest of the lessons might find value in looking through the following topics." +"People often have questions about Git beyond the scope of the core " +"material.\n" +"Students who have completed the rest of the lessons might find value in " +"looking through the following topics." msgstr "" -"People often have questions about Git beyond the scope of the core material.\n" -"Students who have completed the rest of the lessons might find value in looking through the following topics." +"People often have questions about Git beyond the scope of the core " +"material.\n" +"Students who have completed the rest of the lessons might find value in " +"looking through the following topics." #: git-novice/_extras/discuss.md:12 msgid "" -"Note that since this material isn't essential for basic Git usage, it won't be covered by the instructor." +"Note that since this material isn't essential for basic Git usage, it won't " +"be covered by the instructor." msgstr "" -"Note that since this material isn't essential for basic Git usage, it won't be covered by the instructor." +"Note that since this material isn't essential for basic Git usage, it won't " +"be covered by the instructor." # header #: git-novice/_extras/discuss.md:14 @@ -8132,12 +8811,14 @@ msgstr "## More Advanced Git Configuration" msgid "" "In [Setting Up Git]({{ page.root }}/02-setup/),\n" "we used `git config --global` to set some default options for Git.\n" -"It turns out that these configuration options get stored in your home directory\n" +"It turns out that these configuration options get stored in your home " +"directory\n" "in a plain text file called `.gitconfig`." msgstr "" "In [Setting Up Git]({{ page.root }}/02-setup/),\n" "we used `git config --global` to set some default options for Git.\n" -"It turns out that these configuration options get stored in your home directory\n" +"It turns out that these configuration options get stored in your home " +"directory\n" "in a plain text file called `.gitconfig`." # code block @@ -8230,9 +8911,11 @@ msgstr "" #: git-novice/_extras/discuss.md:60 msgid "" -"Now if we return to the example from [Exploring History]({{ page.root }}/05-history/) where we ran:" +"Now if we return to the example from [Exploring History]({{ page.root }}/05-" +"history/) where we ran:" msgstr "" -"Now if we return to the example from [Exploring History]({{ page.root }}/05-history/) where we ran:" +"Now if we return to the example from [Exploring History]({{ page.root }}/05-" +"history/) where we ran:" #: git-novice/_extras/discuss.md:67 msgid "we could now instead type:" @@ -8268,11 +8951,13 @@ msgstr "" #: git-novice/_extras/discuss.md:81 msgid "" -"You can use `git log --help` and `git config --help` to look for different ways to change\n" +"You can use `git log --help` and `git config --help` to look for different " +"ways to change\n" "the log output.\n" "Try the following commands and see what effect they have:" msgstr "" -"You can use `git log --help` and `git config --help` to look for different ways to change\n" +"You can use `git log --help` and `git config --help` to look for different " +"ways to change\n" "the log output.\n" "Try the following commands and see what effect they have:" @@ -8324,7 +9009,8 @@ msgstr "> ## Undoing Git Configuration Changes" #: git-novice/_extras/discuss.md:104 msgid "" ">\n" -"> You can use the `--unset` flag to delete unwanted options from `.gitconfig`.\n" +"> You can use the `--unset` flag to delete unwanted options from `." +"gitconfig`.\n" "> Another way to roll back changes is to store your `.gitconfig` using Git.\n" ">\n" "> For hints on what you might want to configure,\n" @@ -8333,10 +9019,12 @@ msgid "" "> their own Git configuration files.\n" "> Sort them by the number of stars and have a look at the top few.\n" "> If you find some you like,\n" -"> please check that they're covered by an open source license before you clone them." +"> please check that they're covered by an open source license before you " +"clone them." msgstr "" ">\n" -"> You can use the `--unset` flag to delete unwanted options from `.gitconfig`.\n" +"> You can use the `--unset` flag to delete unwanted options from `." +"gitconfig`.\n" "> Another way to roll back changes is to store your `.gitconfig` using Git.\n" ">\n" "> For hints on what you might want to configure,\n" @@ -8345,7 +9033,8 @@ msgstr "" "> their own Git configuration files.\n" "> Sort them by the number of stars and have a look at the top few.\n" "> If you find some you like,\n" -"> please check that they're covered by an open source license before you clone them." +"> please check that they're covered by an open source license before you " +"clone them." # header #: git-novice/_extras/discuss.md:117 @@ -8372,24 +9061,32 @@ msgstr "We will now revisit this in more detail." #: git-novice/_extras/discuss.md:127 msgid "" -"Many people want to version control non-text files, such as images, PDFs and Microsoft Office or LibreOffice documents.\n" -"It is true that Git can handle these filetypes (which fall under the banner of \"binary\" file types).\n" +"Many people want to version control non-text files, such as images, PDFs and " +"Microsoft Office or LibreOffice documents.\n" +"It is true that Git can handle these filetypes (which fall under the banner " +"of \"binary\" file types).\n" "However, just because it *can* be done doesn't mean it *should* be done." msgstr "" -"Many people want to version control non-text files, such as images, PDFs and Microsoft Office or LibreOffice documents.\n" -"It is true that Git can handle these filetypes (which fall under the banner of \"binary\" file types).\n" +"Many people want to version control non-text files, such as images, PDFs and " +"Microsoft Office or LibreOffice documents.\n" +"It is true that Git can handle these filetypes (which fall under the banner " +"of \"binary\" file types).\n" "However, just because it *can* be done doesn't mean it *should* be done." #: git-novice/_extras/discuss.md:131 msgid "" -"Much of Git's magic comes from being able to do line-by-line comparisons (\"diffs\") between files.\n" +"Much of Git's magic comes from being able to do line-by-line comparisons " +"(\"diffs\") between files.\n" "This is generally easy for programming source code and marked up text.\n" -"For non-text files, a diff can usually only detect that the files have changed\n" +"For non-text files, a diff can usually only detect that the files have " +"changed\n" "but can't say how or where." msgstr "" -"Much of Git's magic comes from being able to do line-by-line comparisons (\"diffs\") between files.\n" +"Much of Git's magic comes from being able to do line-by-line comparisons " +"(\"diffs\") between files.\n" "This is generally easy for programming source code and marked up text.\n" -"For non-text files, a diff can usually only detect that the files have changed\n" +"For non-text files, a diff can usually only detect that the files have " +"changed\n" "but can't say how or where." #: git-novice/_extras/discuss.md:136 @@ -8429,19 +9126,25 @@ msgstr "" #: git-novice/_extras/discuss.md:151 msgid "" -"Use a program such as Microsoft Word or LibreOffice Writer to create a new document.\n" +"Use a program such as Microsoft Word or LibreOffice Writer to create a new " +"document.\n" "Enter the same text that we began with before:" msgstr "" -"Use a program such as Microsoft Word or LibreOffice Writer to create a new document.\n" +"Use a program such as Microsoft Word or LibreOffice Writer to create a new " +"document.\n" "Enter the same text that we began with before:" #: git-novice/_extras/discuss.md:159 msgid "" -"Save the document into the `planets-nontext` directory with the name of `mars.doc`.\n" -"Back in the terminal, run the usual commands for setting up a new Git repository:" +"Save the document into the `planets-nontext` directory with the name of " +"`mars.doc`.\n" +"Back in the terminal, run the usual commands for setting up a new Git " +"repository:" msgstr "" -"Save the document into the `planets-nontext` directory with the name of `mars.doc`.\n" -"Back in the terminal, run the usual commands for setting up a new Git repository:" +"Save the document into the `planets-nontext` directory with the name of " +"`mars.doc`.\n" +"Back in the terminal, run the usual commands for setting up a new Git " +"repository:" # code block #: git-novice/_extras/discuss.md:162 @@ -8460,9 +9163,11 @@ msgstr "" #: git-novice/_extras/discuss.md:169 msgid "" -"Then make the same changes to `mars.doc` that we (or Vlad) previously made to `mars.txt`." +"Then make the same changes to `mars.doc` that we (or Vlad) previously made " +"to `mars.txt`." msgstr "" -"Then make the same changes to `mars.doc` that we (or のび太) previously made to `mars.txt`." +"Then make the same changes to `mars.doc` that we (or のび太) previously made " +"to `mars.txt`." #: git-novice/_extras/discuss.md:177 msgid "" @@ -8501,37 +9206,49 @@ msgstr "" #: git-novice/_extras/discuss.md:208 msgid "" -"An uninformative `git diff` is not the only consequence of using Git on binary files.\n" -"However, most of the other problems boil down to whether or not a good diff is possible." +"An uninformative `git diff` is not the only consequence of using Git on " +"binary files.\n" +"However, most of the other problems boil down to whether or not a good diff " +"is possible." msgstr "" -"An uninformative `git diff` is not the only consequence of using Git on binary files.\n" -"However, most of the other problems boil down to whether or not a good diff is possible." +"An uninformative `git diff` is not the only consequence of using Git on " +"binary files.\n" +"However, most of the other problems boil down to whether or not a good diff " +"is possible." #: git-novice/_extras/discuss.md:211 msgid "" "This isn't to say you should *never* use Git on binary files.\n" "A rule of thumb is that it's OK if the binary file won't change very often,\n" -"and if it does change, you don't care about merging in small differences between versions." +"and if it does change, you don't care about merging in small differences " +"between versions." msgstr "" "This isn't to say you should *never* use Git on binary files.\n" "A rule of thumb is that it's OK if the binary file won't change very often,\n" -"and if it does change, you don't care about merging in small differences between versions." +"and if it does change, you don't care about merging in small differences " +"between versions." #: git-novice/_extras/discuss.md:215 msgid "" "We've already seen how a word processed report will fail this test.\n" "An example that passes the test is a logo for your organization or project.\n" -"Even though a logo will be stored in a binary format such as `jpg` or `png`,\n" -"you can expect it will remain fairly static through the lifetime of your repository.\n" +"Even though a logo will be stored in a binary format such as `jpg` or " +"`png`,\n" +"you can expect it will remain fairly static through the lifetime of your " +"repository.\n" "On the rare occasion that branding does change,\n" -"you will probably just want to replace the logo completely rather than merge little differences in." +"you will probably just want to replace the logo completely rather than merge " +"little differences in." msgstr "" "We've already seen how a word processed report will fail this test.\n" "An example that passes the test is a logo for your organization or project.\n" -"Even though a logo will be stored in a binary format such as `jpg` or `png`,\n" -"you can expect it will remain fairly static through the lifetime of your repository.\n" +"Even though a logo will be stored in a binary format such as `jpg` or " +"`png`,\n" +"you can expect it will remain fairly static through the lifetime of your " +"repository.\n" "On the rare occasion that branding does change,\n" -"you will probably just want to replace the logo completely rather than merge little differences in." +"you will probably just want to replace the logo completely rather than merge " +"little differences in." # header #: git-novice/_extras/discuss.md:222 @@ -8654,14 +9371,18 @@ msgstr "## Removing a File with Unix" #: git-novice/_extras/discuss.md:281 msgid "" -"Sometimes we might forget to remove the file through Git. If you removed the\n" +"Sometimes we might forget to remove the file through Git. If you removed " +"the\n" "file with Unix `rm` instead of using `git rm`, no worries,\n" -"Git is smart enough to notice the missing file. Let us recreate the file and\n" +"Git is smart enough to notice the missing file. Let us recreate the file " +"and\n" "commit it again." msgstr "" -"Sometimes we might forget to remove the file through Git. If you removed the\n" +"Sometimes we might forget to remove the file through Git. If you removed " +"the\n" "file with Unix `rm` instead of using `git rm`, no worries,\n" -"Git is smart enough to notice the missing file. Let us recreate the file and\n" +"Git is smart enough to notice the missing file. Let us recreate the file " +"and\n" "commit it again." # code block @@ -8703,7 +9424,8 @@ msgid "" "On branch master\n" "Changes not staged for commit:\n" " (use \"git add/rm ...\" to update what will be committed)\n" -" (use \"git checkout -- ...\" to discard changes in working directory)\n" +" (use \"git checkout -- ...\" to discard changes in working " +"directory)\n" "\n" " deleted: nibiru.txt\n" "\n" @@ -8714,7 +9436,8 @@ msgstr "" "On branch master\n" "Changes not staged for commit:\n" " (use \"git add/rm ...\" to update what will be committed)\n" -" (use \"git checkout -- ...\" to discard changes in working directory)\n" +" (use \"git checkout -- ...\" to discard changes in working " +"directory)\n" "\n" " deleted: nibiru.txt\n" "\n" @@ -8912,7 +9635,8 @@ msgid "" "On branch master\n" "Changes not staged for commit:\n" " (use \"git add/rm ...\" to update what will be committed)\n" -" (use \"git checkout -- ...\" to discard changes in working directory)\n" +" (use \"git checkout -- ...\" to discard changes in working " +"directory)\n" "\n" " deleted: krypton.txt\n" "\n" @@ -8928,7 +9652,8 @@ msgstr "" "On branch master\n" "Changes not staged for commit:\n" " (use \"git add/rm ...\" to update what will be committed)\n" -" (use \"git checkout -- ...\" to discard changes in working directory)\n" +" (use \"git checkout -- ...\" to discard changes in working " +"directory)\n" "\n" " deleted: krypton.txt\n" "\n" @@ -9060,23 +9785,29 @@ msgstr " * It's easy to set up" # unordered list #: git-novice/_extras/guide.md:11 msgid "" -" * Every copy of a Git repository is a full backup of a project and its history" +" * Every copy of a Git repository is a full backup of a project and its " +"history" msgstr "" -" * Every copy of a Git repository is a full backup of a project and its history" +" * Every copy of a Git repository is a full backup of a project and its " +"history" # unordered list #: git-novice/_extras/guide.md:12 msgid "" -" * A few easy-to-remember commands are all you need for most day-to-day version control tasks" +" * A few easy-to-remember commands are all you need for most day-to-day " +"version control tasks" msgstr "" -" * A few easy-to-remember commands are all you need for most day-to-day version control tasks" +" * A few easy-to-remember commands are all you need for most day-to-day " +"version control tasks" # unordered list #: git-novice/_extras/guide.md:13 msgid "" -" * The [GitHub][github] hosting service provides a web-based collaboration service" +" * The [GitHub][github] hosting service provides a web-based " +"collaboration service" msgstr "" -" * The [GitHub][github] hosting service provides a web-based collaboration service" +" * The [GitHub][github] hosting service provides a web-based " +"collaboration service" # unordered list #: git-novice/_extras/guide.md:14 @@ -9118,13 +9849,17 @@ msgstr "## Overall" #: git-novice/_extras/guide.md:23 msgid "" "Version control might be the most important topic we teach, but Git is\n" -"definitely the most complicated tool. However, GitHub presently dominates the\n" -"open software repository landscape, so the time and effort required to teach\n" +"definitely the most complicated tool. However, GitHub presently dominates " +"the\n" +"open software repository landscape, so the time and effort required to " +"teach\n" "fundamental Git is justified and worthwhile." msgstr "" "Version control might be the most important topic we teach, but Git is\n" -"definitely the most complicated tool. However, GitHub presently dominates the\n" -"open software repository landscape, so the time and effort required to teach\n" +"definitely the most complicated tool. However, GitHub presently dominates " +"the\n" +"open software repository landscape, so the time and effort required to " +"teach\n" "fundamental Git is justified and worthwhile." #: git-novice/_extras/guide.md:28 @@ -9137,10 +9872,12 @@ msgstr "" #: git-novice/_extras/guide.md:31 msgid "" -"Instead we try to convince them that version control is useful for researchers\n" +"Instead we try to convince them that version control is useful for " +"researchers\n" "working in teams or not, because it is" msgstr "" -"Instead we try to convince them that version control is useful for researchers\n" +"Instead we try to convince them that version control is useful for " +"researchers\n" "working in teams or not, because it is" # unordered list @@ -9168,9 +9905,11 @@ msgstr "## Teaching Notes" # unordered list #: git-novice/_extras/guide.md:40 msgid "" -"* You can \"split\" your shell so that recent commands remain in view using [this](https://github.com/rgaiacs/swc-shell-split-window) script." +"* You can \"split\" your shell so that recent commands remain in view " +"using [this](https://github.com/rgaiacs/swc-shell-split-window) script." msgstr "" -"* You can \"split\" your shell so that recent commands remain in view using [this](https://github.com/rgaiacs/swc-shell-split-window) script." +"* You can \"split\" your shell so that recent commands remain in view " +"using [this](https://github.com/rgaiacs/swc-shell-split-window) script." # unordered list #: git-novice/_extras/guide.md:42 @@ -9180,9 +9919,11 @@ msgstr "* Make sure the network is working *before* starting this lesson." # unordered list #: git-novice/_extras/guide.md:44 msgid "" -"* Drawings are particularly useful in this lesson: if you have a whiteboard," +"* Drawings are particularly useful in this lesson: if you have a " +"whiteboard," msgstr "" -"* Drawings are particularly useful in this lesson: if you have a whiteboard," +"* Drawings are particularly useful in this lesson: if you have a " +"whiteboard," #: git-novice/_extras/guide.md:45 msgid " [use it][drawings]!" @@ -9196,17 +9937,23 @@ msgstr "* Version control is usually not the first subject in a workshop," #: git-novice/_extras/guide.md:48 msgid "" " so get learners to create a GitHub account after the session before.\n" -" Remind learners that the username and email they use for GitHub (and setup\n" +" Remind learners that the username and email they use for GitHub (and " +"setup\n" " during Git configuration) will be viewable to the public by default.\n" -" However, there are many reasons why a learner may not want their personal\n" -" information viewable, and GitHub has [resources for keeping an email address\n" +" However, there are many reasons why a learner may not want their " +"personal\n" +" information viewable, and GitHub has [resources for keeping an email " +"address\n" " private][github-privacy]." msgstr "" " so get learners to create a GitHub account after the session before.\n" -" Remind learners that the username and email they use for GitHub (and setup\n" +" Remind learners that the username and email they use for GitHub (and " +"setup\n" " during Git configuration) will be viewable to the public by default.\n" -" However, there are many reasons why a learner may not want their personal\n" -" information viewable, and GitHub has [resources for keeping an email address\n" +" However, there are many reasons why a learner may not want their " +"personal\n" +" information viewable, and GitHub has [resources for keeping an email " +"address\n" " private][github-privacy]." # unordered list @@ -9240,14 +9987,20 @@ msgstr "" #: git-novice/_extras/guide.md:64 msgid "" -" installs easily and runs reliably on the three major operating systems, and\n" -" because we want learners to understand what commands are being run. That\n" -" said, instructors should demo a GUI on their desktop at some point during\n" +" installs easily and runs reliably on the three major operating systems, " +"and\n" +" because we want learners to understand what commands are being run. " +"That\n" +" said, instructors should demo a GUI on their desktop at some point " +"during\n" " this lesson and point learners at [this page][github-gui]." msgstr "" -" installs easily and runs reliably on the three major operating systems, and\n" -" because we want learners to understand what commands are being run. That\n" -" said, instructors should demo a GUI on their desktop at some point during\n" +" installs easily and runs reliably on the three major operating systems, " +"and\n" +" because we want learners to understand what commands are being run. " +"That\n" +" said, instructors should demo a GUI on their desktop at some point " +"during\n" " this lesson and point learners at [this page][github-gui]." # unordered list @@ -9262,18 +10015,22 @@ msgstr " [DiffMerge][diffmerge]." # unordered list #: git-novice/_extras/guide.md:72 msgid "" -"* When appropriate, explain that we teach Git rather than CVS, Subversion, or" +"* When appropriate, explain that we teach Git rather than CVS, Subversion, " +"or" msgstr "" -"* When appropriate, explain that we teach Git rather than CVS, Subversion, or" +"* When appropriate, explain that we teach Git rather than CVS, Subversion, " +"or" #: git-novice/_extras/guide.md:73 msgid "" " Mercurial primarily because of GitHub's growing popularity: CVS and\n" -" Subversion are now seen as legacy systems, and Mercurial isn't nearly as\n" +" Subversion are now seen as legacy systems, and Mercurial isn't nearly " +"as\n" " widely used in the sciences right now." msgstr "" " Mercurial primarily because of GitHub's growing popularity: CVS and\n" -" Subversion are now seen as legacy systems, and Mercurial isn't nearly as\n" +" Subversion are now seen as legacy systems, and Mercurial isn't nearly " +"as\n" " widely used in the sciences right now." # unordered list @@ -9288,13 +10045,19 @@ msgstr " * [git-it][git-it] is a self-paced command-line Git demo," #: git-novice/_extras/guide.md:79 msgid "" -" with [git-it-electron][git-it-electron] its GitHub Desktop successor.\n" -" * [Code School][code-school] has a free interactive course, [Try Git][try-git].\n" -" * for instructors, [the Git parable][git-parable] is useful background reading" +" with [git-it-electron][git-it-electron] its GitHub Desktop " +"successor.\n" +" * [Code School][code-school] has a free interactive course, [Try Git]" +"[try-git].\n" +" * for instructors, [the Git parable][git-parable] is useful " +"background reading" msgstr "" -" with [git-it-electron][git-it-electron] its GitHub Desktop successor.\n" -" * [Code School][code-school] has a free interactive course, [Try Git][try-git].\n" -" * for instructors, [the Git parable][git-parable] is useful background reading" +" with [git-it-electron][git-it-electron] its GitHub Desktop " +"successor.\n" +" * [Code School][code-school] has a free interactive course, [Try Git]" +"[try-git].\n" +" * for instructors, [the Git parable][git-parable] is useful " +"background reading" # header #: git-novice/_extras/guide.md:83 @@ -9304,9 +10067,11 @@ msgstr "## [Automated Version Control]({{ page.root }}/01-basics/)" # unordered list #: git-novice/_extras/guide.md:85 msgid "" -"* Ask, \"Who uses 'undo' in their editor?\" All say \"Me\". 'Undo' is the simplest" +"* Ask, \"Who uses 'undo' in their editor?\" All say \"Me\". 'Undo' is the " +"simplest" msgstr "" -"* Ask, \"Who uses 'undo' in their editor?\" All say \"Me\". 'Undo' is the simplest" +"* Ask, \"Who uses 'undo' in their editor?\" All say \"Me\". 'Undo' is the " +"simplest" #: git-novice/_extras/guide.md:86 msgid " form of version control." @@ -9315,31 +10080,45 @@ msgstr " form of version control." # unordered list #: git-novice/_extras/guide.md:88 msgid "" -"* Give learners a five-minute overview of what version control does for them" +"* Give learners a five-minute overview of what version control does for " +"them" msgstr "" -"* Give learners a five-minute overview of what version control does for them" +"* Give learners a five-minute overview of what version control does for " +"them" #: git-novice/_extras/guide.md:89 msgid "" " before diving into the watch-and-do practicals. Most of them will have\n" -" tried to co-author papers by emailing files back and forth, or will have\n" -" biked into the office only to realize that the USB key with last night's\n" -" work is still on the kitchen table. Instructors can also make jokes about\n" +" tried to co-author papers by emailing files back and forth, or will " +"have\n" +" biked into the office only to realize that the USB key with last " +"night's\n" +" work is still on the kitchen table. Instructors can also make jokes " +"about\n" " directories with names like \"final version\", \"final version revised" "\",\n" -" \"final version with reviewer three's corrections\", \"really final version\",\n" -" and, \"come on this really has to be the last version\" to motivate version\n" -" control as a better way to collaborate and as a better way to back work up." +" \"final version with reviewer three's corrections\", \"really final " +"version\",\n" +" and, \"come on this really has to be the last version\" to motivate " +"version\n" +" control as a better way to collaborate and as a better way to back work " +"up." msgstr "" " before diving into the watch-and-do practicals. Most of them will have\n" -" tried to co-author papers by emailing files back and forth, or will have\n" -" biked into the office only to realize that the USB key with last night's\n" -" work is still on the kitchen table. Instructors can also make jokes about\n" +" tried to co-author papers by emailing files back and forth, or will " +"have\n" +" biked into the office only to realize that the USB key with last " +"night's\n" +" work is still on the kitchen table. Instructors can also make jokes " +"about\n" " directories with names like \"final version\", \"final version revised" "\",\n" -" \"final version with reviewer three's corrections\", \"really final version\",\n" -" and, \"come on this really has to be the last version\" to motivate version\n" -" control as a better way to collaborate and as a better way to back work up." +" \"final version with reviewer three's corrections\", \"really final " +"version\",\n" +" and, \"come on this really has to be the last version\" to motivate " +"version\n" +" control as a better way to collaborate and as a better way to back work " +"up." # header #: git-novice/_extras/guide.md:98 @@ -9349,9 +10128,11 @@ msgstr "## [Setting Up Git]({{ page.root }}/02-setup/)" # unordered list #: git-novice/_extras/guide.md:100 msgid "" -"* We suggest instructors and students use `nano` as the text editor for this" +"* We suggest instructors and students use `nano` as the text editor for " +"this" msgstr "" -"* We suggest instructors and students use `nano` as the text editor for this" +"* We suggest instructors and students use `nano` as the text editor for " +"this" #: git-novice/_extras/guide.md:101 msgid " lessons because" @@ -9365,9 +10146,11 @@ msgstr " * it runs in all three major operating systems," # unordered list #: git-novice/_extras/guide.md:104 msgid "" -" * it runs inside the shell (switching windows can be confusing to students), and" +" * it runs inside the shell (switching windows can be confusing to " +"students), and" msgstr "" -" * it runs inside the shell (switching windows can be confusing to students), and" +" * it runs inside the shell (switching windows can be confusing to " +"students), and" # unordered list #: git-novice/_extras/guide.md:105 @@ -9391,10 +10174,12 @@ msgstr "" #: git-novice/_extras/guide.md:111 msgid "" -" common for them to edit the instructor's details (e.g. email). Check at\n" +" common for them to edit the instructor's details (e.g. email). Check " +"at\n" " the end using `git config --list`." msgstr "" -" common for them to edit the instructor's details (e.g. email). Check at\n" +" common for them to edit the instructor's details (e.g. email). Check " +"at\n" " the end using `git config --list`." # header @@ -9416,26 +10201,36 @@ msgstr " untracked. This a file that Mac OS creates in each directory." # unordered list #: git-novice/_extras/guide.md:119 msgid "" -"* The challenge \"Places to create repositories\" tries to reinforce the idea" +"* The challenge \"Places to create repositories\" tries to reinforce the " +"idea" msgstr "" -"* The challenge \"Places to create repositories\" tries to reinforce the idea" +"* The challenge \"Places to create repositories\" tries to reinforce the " +"idea" #: git-novice/_extras/guide.md:120 msgid "" -" that the `.git` folder contains the whole Git repo and deleting this folder\n" -" undoes a `git init`. It also gives the learner the way to fix the common\n" -" mistake of putting unwanted folders (like `Desktop`) under version control." +" that the `.git` folder contains the whole Git repo and deleting this " +"folder\n" +" undoes a `git init`. It also gives the learner the way to fix the " +"common\n" +" mistake of putting unwanted folders (like `Desktop`) under version " +"control." msgstr "" -" that the `.git` folder contains the whole Git repo and deleting this folder\n" -" undoes a `git init`. It also gives the learner the way to fix the common\n" -" mistake of putting unwanted folders (like `Desktop`) under version control." +" that the `.git` folder contains the whole Git repo and deleting this " +"folder\n" +" undoes a `git init`. It also gives the learner the way to fix the " +"common\n" +" mistake of putting unwanted folders (like `Desktop`) under version " +"control." #: git-novice/_extras/guide.md:124 msgid "" -" Instead of removing the `.git` folder directly, you can choose to move it\n" +" Instead of removing the `.git` folder directly, you can choose to move " +"it\n" " first to a safer directory and remove it from there:" msgstr "" -" Instead of removing the `.git` folder directly, you can choose to move it\n" +" Instead of removing the `.git` folder directly, you can choose to move " +"it\n" " first to a safer directory and remove it from there:" #: git-novice/_extras/guide.md:127 @@ -9454,11 +10249,15 @@ msgstr "" #: git-novice/_extras/guide.md:133 msgid "" -" The challenge suggests that it is a bad idea to create a Git repo inside another repo.\n" -" For more discussion on this topic, please see [this issue][repos-in-repos]." +" The challenge suggests that it is a bad idea to create a Git repo inside " +"another repo.\n" +" For more discussion on this topic, please see [this issue][repos-in-" +"repos]." msgstr "" -" The challenge suggests that it is a bad idea to create a Git repo inside another repo.\n" -" For more discussion on this topic, please see [this issue][repos-in-repos]." +" The challenge suggests that it is a bad idea to create a Git repo inside " +"another repo.\n" +" For more discussion on this topic, please see [this issue][repos-in-" +"repos]." # header #: git-novice/_extras/guide.md:136 @@ -9503,16 +10302,22 @@ msgstr "" #: git-novice/_extras/guide.md:146 msgid "" " doing `$ git checkout f22b25e mars.txt`, someone does `$ git checkout\n" -" f22b25e`, they wind up in the \"detached HEAD\" state and confusion abounds.\n" -" It's then possible to keep on committing, but things like `git push origin\n" -" master` a bit later will not give easily comprehensible results. It also\n" +" f22b25e`, they wind up in the \"detached HEAD\" state and confusion " +"abounds.\n" +" It's then possible to keep on committing, but things like `git push " +"origin\n" +" master` a bit later will not give easily comprehensible results. It " +"also\n" " makes it look like commits can be lost. To \"re-attach\" HEAD, use\n" " `git checkout master`." msgstr "" " doing `$ git checkout f22b25e mars.txt`, someone does `$ git checkout\n" -" f22b25e`, they wind up in the \"detached HEAD\" state and confusion abounds.\n" -" It's then possible to keep on committing, but things like `git push origin\n" -" master` a bit later will not give easily comprehensible results. It also\n" +" f22b25e`, they wind up in the \"detached HEAD\" state and confusion " +"abounds.\n" +" It's then possible to keep on committing, but things like `git push " +"origin\n" +" master` a bit later will not give easily comprehensible results. It " +"also\n" " makes it look like commits can be lost. To \"re-attach\" HEAD, use\n" " `git checkout master`." @@ -9534,10 +10339,12 @@ msgstr "## [Ignoring Things]({{ page.root }}/06-ignore/)" #: git-novice/_extras/guide.md:158 msgid "" -"Just remember that you can use wildcards and regular expressions to ignore a\n" +"Just remember that you can use wildcards and regular expressions to ignore " +"a\n" "particular set of files in `.gitignore`." msgstr "" -"Just remember that you can use wildcards and regular expressions to ignore a\n" +"Just remember that you can use wildcards and regular expressions to ignore " +"a\n" "particular set of files in `.gitignore`." # header @@ -9555,28 +10362,36 @@ msgstr "" #: git-novice/_extras/guide.md:164 msgid "" " source version control tool, GitHub is a company that hosts Git\n" -" repositories in the web and provides a web interface to interact with repos\n" +" repositories in the web and provides a web interface to interact with " +"repos\n" " they host." msgstr "" " source version control tool, GitHub is a company that hosts Git\n" -" repositories in the web and provides a web interface to interact with repos\n" +" repositories in the web and provides a web interface to interact with " +"repos\n" " they host." # unordered list #: git-novice/_extras/guide.md:168 msgid "" -"* If your learners are advanced enough to be comfortable with SSH, tell them" +"* If your learners are advanced enough to be comfortable with SSH, tell " +"them" msgstr "" -"* If your learners are advanced enough to be comfortable with SSH, tell them" +"* If your learners are advanced enough to be comfortable with SSH, tell " +"them" #: git-novice/_extras/guide.md:169 msgid "" -" they can use keys to authenticate on GitHub instead of passwords, but don't\n" -" try to set this up during class: it takes too long, and is a distraction\n" +" they can use keys to authenticate on GitHub instead of passwords, but " +"don't\n" +" try to set this up during class: it takes too long, and is a " +"distraction\n" " from the core ideas of the lesson." msgstr "" -" they can use keys to authenticate on GitHub instead of passwords, but don't\n" -" try to set this up during class: it takes too long, and is a distraction\n" +" they can use keys to authenticate on GitHub instead of passwords, but " +"don't\n" +" try to set this up during class: it takes too long, and is a " +"distraction\n" " from the core ideas of the lesson." # unordered list @@ -9602,11 +10417,13 @@ msgstr "* Decide in advance whether all the learners will work in one shared" #: git-novice/_extras/guide.md:179 msgid "" -" repository, or whether they will work in pairs (or other small groups) in\n" +" repository, or whether they will work in pairs (or other small groups) " +"in\n" " separate repositories. The former is easier to set up; the latter runs\n" " more smoothly." msgstr "" -" repository, or whether they will work in pairs (or other small groups) in\n" +" repository, or whether they will work in pairs (or other small groups) " +"in\n" " separate repositories. The former is easier to set up; the latter runs\n" " more smoothly." @@ -9619,66 +10436,90 @@ msgstr "" #: git-novice/_extras/guide.md:184 msgid "" -" collaboration and conflict sections of the lesson. One instructor can play\n" -" the role of the repository owner, while the second instructor can play the\n" -" role of the collaborator. If it is possible, try to use two projectors so\n" -" that the computer screens of both instructors can be seen. This makes for\n" +" collaboration and conflict sections of the lesson. One instructor can " +"play\n" +" the role of the repository owner, while the second instructor can play " +"the\n" +" role of the collaborator. If it is possible, try to use two projectors " +"so\n" +" that the computer screens of both instructors can be seen. This makes " +"for\n" " a very clear illustration to the students as to who does what." msgstr "" -" collaboration and conflict sections of the lesson. One instructor can play\n" -" the role of the repository owner, while the second instructor can play the\n" -" role of the collaborator. If it is possible, try to use two projectors so\n" -" that the computer screens of both instructors can be seen. This makes for\n" +" collaboration and conflict sections of the lesson. One instructor can " +"play\n" +" the role of the repository owner, while the second instructor can play " +"the\n" +" role of the collaborator. If it is possible, try to use two projectors " +"so\n" +" that the computer screens of both instructors can be seen. This makes " +"for\n" " a very clear illustration to the students as to who does what." # unordered list #: git-novice/_extras/guide.md:190 msgid "" -"* It is also effective to pair up students during this lesson and assign one" +"* It is also effective to pair up students during this lesson and assign " +"one" msgstr "" -"* It is also effective to pair up students during this lesson and assign one" +"* It is also effective to pair up students during this lesson and assign " +"one" #: git-novice/_extras/guide.md:191 msgid "" -" member of the pair to take the role of the owner and the other the role of\n" +" member of the pair to take the role of the owner and the other the role " +"of\n" " the collaborator. In this setup, challenges can include asking the\n" -" collaborator to make a change, commit it, and push the change to the remote\n" +" collaborator to make a change, commit it, and push the change to the " +"remote\n" " repository so that the owner can then retrieve it, and vice-versa. The\n" " role playing between the instructors can get a bit \"dramatic\" in the\n" -" conflicts part of the lesson if the instructors want to inject some humor\n" +" conflicts part of the lesson if the instructors want to inject some " +"humor\n" " into the room." msgstr "" -" member of the pair to take the role of the owner and the other the role of\n" +" member of the pair to take the role of the owner and the other the role " +"of\n" " the collaborator. In this setup, challenges can include asking the\n" -" collaborator to make a change, commit it, and push the change to the remote\n" +" collaborator to make a change, commit it, and push the change to the " +"remote\n" " repository so that the owner can then retrieve it, and vice-versa. The\n" " role playing between the instructors can get a bit \"dramatic\" in the\n" -" conflicts part of the lesson if the instructors want to inject some humor\n" +" conflicts part of the lesson if the instructors want to inject some " +"humor\n" " into the room." # unordered list #: git-novice/_extras/guide.md:199 msgid "" -"* If you don't have two projectors, have two instructors at the front of the" +"* If you don't have two projectors, have two instructors at the front of " +"the" msgstr "" -"* If you don't have two projectors, have two instructors at the front of the" +"* If you don't have two projectors, have two instructors at the front of " +"the" #: git-novice/_extras/guide.md:200 msgid "" -" room. Each instructor does their piece of the collaboration demonstration\n" +" room. Each instructor does their piece of the collaboration " +"demonstration\n" " on their own computer and then passes the projector cord back and forth\n" -" with the other instructor when it's time for them to do the other part of\n" +" with the other instructor when it's time for them to do the other part " +"of\n" " the collaborative workflow. It takes less than 10 seconds for each\n" " switchover, so it doesn't interrupt the flow of the lesson.\n" -" And of course it helps to give each of the instructors a different-colored\n" +" And of course it helps to give each of the instructors a different-" +"colored\n" " hat, or put different-colored sticky notes on their foreheads." msgstr "" -" room. Each instructor does their piece of the collaboration demonstration\n" +" room. Each instructor does their piece of the collaboration " +"demonstration\n" " on their own computer and then passes the projector cord back and forth\n" -" with the other instructor when it's time for them to do the other part of\n" +" with the other instructor when it's time for them to do the other part " +"of\n" " the collaborative workflow. It takes less than 10 seconds for each\n" " switchover, so it doesn't interrupt the flow of the lesson.\n" -" And of course it helps to give each of the instructors a different-colored\n" +" And of course it helps to give each of the instructors a different-" +"colored\n" " hat, or put different-colored sticky notes on their foreheads." # unordered list @@ -9690,10 +10531,12 @@ msgstr "" #: git-novice/_extras/guide.md:209 msgid "" -" repos in your Desktop, but under different names, e.g., pretend one is your\n" +" repos in your Desktop, but under different names, e.g., pretend one is " +"your\n" " computer at work:" msgstr "" -" repos in your Desktop, but under different names, e.g., pretend one is your\n" +" repos in your Desktop, but under different names, e.g., pretend one is " +"your\n" " computer at work:" #: git-novice/_extras/guide.md:212 @@ -9736,10 +10579,12 @@ msgstr "" #: git-novice/_extras/guide.md:224 msgid "" -" best way to achieve this is moving to the `Desktop` before cloning: `cd &&\n" +" best way to achieve this is moving to the `Desktop` before cloning: `cd " +"&&\n" " cd Desktop`." msgstr "" -" best way to achieve this is moving to the `Desktop` before cloning: `cd &&\n" +" best way to achieve this is moving to the `Desktop` before cloning: `cd " +"&&\n" " cd Desktop`." # unordered list @@ -9779,9 +10624,11 @@ msgstr " `pull` afterward, they may get a conflict." # unordered list #: git-novice/_extras/guide.md:238 msgid "" -"* Conflicts, sometimes weird, will start to arise. Stay tight: conflicts are" +"* Conflicts, sometimes weird, will start to arise. Stay tight: conflicts " +"are" msgstr "" -"* Conflicts, sometimes weird, will start to arise. Stay tight: conflicts are" +"* Conflicts, sometimes weird, will start to arise. Stay tight: conflicts " +"are" #: git-novice/_extras/guide.md:239 msgid " next." @@ -9795,9 +10642,11 @@ msgstr "## [Conflicts]({{ page.root }}/09-conflict/)" # unordered list #: git-novice/_extras/guide.md:243 msgid "" -"* Expect the learners to make mistakes. Expect *yourself* to make mistakes. This" +"* Expect the learners to make mistakes. Expect *yourself* to make " +"mistakes. This" msgstr "" -"* Expect the learners to make mistakes. Expect *yourself* to make mistakes. This" +"* Expect the learners to make mistakes. Expect *yourself* to make " +"mistakes. This" #: git-novice/_extras/guide.md:244 msgid " happens because it is late in the lesson and everyone is tired." @@ -9813,30 +10662,38 @@ msgstr "" # unordered list #: git-novice/_extras/guide.md:248 msgid "" -" * Clone your repo in a different directory, pretending is your computer at" +" * Clone your repo in a different directory, pretending is your " +"computer at" msgstr "" -" * Clone your repo in a different directory, pretending is your computer at" +" * Clone your repo in a different directory, pretending is your " +"computer at" #: git-novice/_extras/guide.md:249 msgid "" -" work: `git clone https://github.com/vlad/planets.git planets-at-work`.\n" +" work: `git clone https://github.com/vlad/planets.git planets-at-" +"work`.\n" " * At the office, you make a change, commit and push.\n" -" * At your laptop repo, you (forget to pull and) make a change, commit and\n" +" * At your laptop repo, you (forget to pull and) make a change, commit " +"and\n" " try to push.\n" " * `git pull` now and show the conflict." msgstr "" -" work: `git clone https://github.com/nobita/planets.git planets-at-work`.\n" +" work: `git clone https://github.com/nobita/planets.git planets-at-" +"work`.\n" " * At the office, you make a change, commit and push.\n" -" * At your laptop repo, you (forget to pull and) make a change, commit and\n" +" * At your laptop repo, you (forget to pull and) make a change, commit " +"and\n" " try to push.\n" " * `git pull` now and show the conflict." # unordered list #: git-novice/_extras/guide.md:255 msgid "" -"* Learners usually forget to `git add` the file after fixing the conflict and" +"* Learners usually forget to `git add` the file after fixing the conflict " +"and" msgstr "" -"* Learners usually forget to `git add` the file after fixing the conflict and" +"* Learners usually forget to `git add` the file after fixing the conflict " +"and" #: git-novice/_extras/guide.md:256 msgid " just (try to) commit. You can diagnose this with `git status`." @@ -9882,13 +10739,17 @@ msgstr "## [Licensing]({{ page.root }}/11-licensing/)" #: git-novice/_extras/guide.md:270 msgid "" "We teach about licensing because questions about who owns what, or can use\n" -"what, arise naturally once we start talking about using public services like\n" -"GitHub to store files. Also, the discussion gives learners a chance to catch\n" +"what, arise naturally once we start talking about using public services " +"like\n" +"GitHub to store files. Also, the discussion gives learners a chance to " +"catch\n" "their breath after what is often a frustrating couple of hours." msgstr "" "We teach about licensing because questions about who owns what, or can use\n" -"what, arise naturally once we start talking about using public services like\n" -"GitHub to store files. Also, the discussion gives learners a chance to catch\n" +"what, arise naturally once we start talking about using public services " +"like\n" +"GitHub to store files. Also, the discussion gives learners a chance to " +"catch\n" "their breath after what is often a frustrating couple of hours." # header @@ -9920,11 +10781,14 @@ msgid "" "[drawings]: https://marklodato.github.io/visual-git-guide/index-en.html\n" "[git-it]: https://github.com/jlord/git-it\n" "[git-it-electron]: https://github.com/jlord/git-it-electron\n" -"[git-parable]: http://tom.preston-werner.com/2009/05/19/the-git-parable.html\n" +"[git-parable]: http://tom.preston-werner.com/2009/05/19/the-git-parable." +"html\n" "[github]: https://github.com/\n" "[github-gui]: https://git-scm.com/downloads/guis\n" -"[github-line-endings]: https://help.github.com/articles/dealing-with-line-endings/#platform-all\n" -"[github-privacy]: https://help.github.com/articles/keeping-your-email-address-private/\n" +"[github-line-endings]: https://help.github.com/articles/dealing-with-line-" +"endings/#platform-all\n" +"[github-privacy]: https://help.github.com/articles/keeping-your-email-" +"address-private/\n" "[repos-in-repos]: https://github.com/swcarpentry/git-novice/issues/272\n" "[try-git]: https://try.github.io" msgstr "" @@ -9933,11 +10797,14 @@ msgstr "" "[drawings]: https://marklodato.github.io/visual-git-guide/index-en.html\n" "[git-it]: https://github.com/jlord/git-it\n" "[git-it-electron]: https://github.com/jlord/git-it-electron\n" -"[git-parable]: http://tom.preston-werner.com/2009/05/19/the-git-parable.html\n" +"[git-parable]: http://tom.preston-werner.com/2009/05/19/the-git-parable." +"html\n" "[github]: https://github.com/\n" "[github-gui]: https://git-scm.com/downloads/guis\n" -"[github-line-endings]: https://help.github.com/articles/dealing-with-line-endings/#platform-all\n" -"[github-privacy]: https://help.github.com/articles/keeping-your-email-address-private/\n" +"[github-line-endings]: https://help.github.com/articles/dealing-with-line-" +"endings/#platform-all\n" +"[github-privacy]: https://help.github.com/articles/keeping-your-email-" +"address-private/\n" "[repos-in-repos]: https://github.com/swcarpentry/git-novice/issues/272\n" "[try-git]: https://try.github.io" @@ -9964,10 +10831,12 @@ msgid "" " \"{{ episode.url}}\"{% unless forloop.last %},{% endunless %}\n" " {% endfor %}\n" " ];\n" -" var xmlHttp = []; /* Required since we are going to query every episode. */\n" +" var xmlHttp = []; /* Required since we are going to query every " +"episode. */\n" " for (i=0; i < lesson_episodes.length; i++) {\n" " xmlHttp[i] = new XMLHttpRequest();\n" -" xmlHttp[i].episode = lesson_episodes[i]; /* To enable use this later. */\n" +" xmlHttp[i].episode = lesson_episodes[i]; /* To enable use this later. " +"*/\n" " xmlHttp[i].onreadystatechange = function() {\n" " if (this.readyState == 4 && this.status == 200) {\n" " var article_here = document.getElementById(this.episode);\n" @@ -9992,10 +10861,12 @@ msgstr "" " \"{{ episode.url}}\"{% unless forloop.last %},{% endunless %}\n" " {% endfor %}\n" " ];\n" -" var xmlHttp = []; /* Required since we are going to query every episode. */\n" +" var xmlHttp = []; /* Required since we are going to query every " +"episode. */\n" " for (i=0; i < lesson_episodes.length; i++) {\n" " xmlHttp[i] = new XMLHttpRequest();\n" -" xmlHttp[i].episode = lesson_episodes[i]; /* To enable use this later. */\n" +" xmlHttp[i].episode = lesson_episodes[i]; /* To enable use this later. " +"*/\n" " xmlHttp[i].onreadystatechange = function() {\n" " if (this.readyState == 4 && this.status == 200) {\n" " var article_here = document.getElementById(this.episode);\n" @@ -10063,8 +10934,10 @@ msgstr "" #: git-novice/index.md:15 msgid "" -"A colleague suggests using [version control]({{ page.root }}/reference#version-control) to\n" -"manage their work. Version control is better than mailing files back and forth:" +"A colleague suggests using [version control]({{ page.root }}/" +"reference#version-control) to\n" +"manage their work. Version control is better than mailing files back and " +"forth:" msgstr "" "同僚は、[バーションの管理は]({{page.root}} / reference＃version-control)を" "使って作業を\n" @@ -10111,8 +10984,10 @@ msgstr "* 同じプロジェクトで複数の人が協力し合う場合、" #: git-novice/index.md:29 msgid "" -" accidentally overlook or overwrite someone's changes. The version control\n" -" system automatically notifies users whenever there's a conflict between one\n" +" accidentally overlook or overwrite someone's changes. The version " +"control\n" +" system automatically notifies users whenever there's a conflict between " +"one\n" " person's work and another's." msgstr "" " 間違って誰かの変更を見落としたり上書きしたりする可能性があります。\n" @@ -10195,23 +11070,39 @@ msgstr "## Git Cheatsheets for Quick Reference" # unordered list #: git-novice/reference.md:8 msgid "" -"* A great [printable git cheatsheet](https://services.github.com/on-demand/downloads/github-git-cheat-sheet.pdf) is available in PDF from the" +"* A great [printable git cheatsheet](https://services.github.com/on-demand/" +"downloads/github-git-cheat-sheet.pdf) is available in PDF from the" msgstr "" -"* A great [printable git cheatsheet](https://services.github.com/on-demand/downloads/github-git-cheat-sheet.pdf) is available in PDF from the" +"* A great [printable git cheatsheet](https://services.github.com/on-demand/" +"downloads/github-git-cheat-sheet.pdf) is available in PDF from the" #: git-novice/reference.md:9 msgid "" "[GitHub training website](https://services.github.com/resources/).\n" -"* An [interactive one-page visualisation](http://ndpsoftware.com/git-cheatsheet.html)\n" -" about the relationships between workspace, staging area, local repository, upstream repository, and the commands associated with each (with explanations).\n" -"* Both resources are also available in other languages (e.g. Spanish, French, and more).\n" -"* \"[Happy Git and GitHub for the useR](http://happygitwithr.com)\" is an accessible, free online book by Jenny Bryan on how to setup and use git and GitHub with specific references on the integration of git with RStudio and working with git in R." +"* An [interactive one-page visualisation](http://ndpsoftware.com/git-" +"cheatsheet.html)\n" +" about the relationships between workspace, staging area, local " +"repository, upstream repository, and the commands associated with each (with " +"explanations).\n" +"* Both resources are also available in other languages (e.g. Spanish, " +"French, and more).\n" +"* \"[Happy Git and GitHub for the useR](http://happygitwithr.com)\" is an " +"accessible, free online book by Jenny Bryan on how to setup and use git and " +"GitHub with specific references on the integration of git with RStudio and " +"working with git in R." msgstr "" "[GitHub training website](https://services.github.com/resources/).\n" -"* An [interactive one-page visualisation](http://ndpsoftware.com/git-cheatsheet.html)\n" -" about the relationships between workspace, staging area, local repository, upstream repository, and the commands associated with each (with explanations).\n" -"* Both resources are also available in other languages (e.g. Spanish, French, and more).\n" -"* \"[Happy Git and GitHub for the useR](http://happygitwithr.com)\" is an accessible, free online book by Jenny Bryan on how to setup and use git and GitHub with specific references on the integration of git with RStudio and working with git in R." +"* An [interactive one-page visualisation](http://ndpsoftware.com/git-" +"cheatsheet.html)\n" +" about the relationships between workspace, staging area, local " +"repository, upstream repository, and the commands associated with each (with " +"explanations).\n" +"* Both resources are also available in other languages (e.g. Spanish, " +"French, and more).\n" +"* \"[Happy Git and GitHub for the useR](http://happygitwithr.com)\" is an " +"accessible, free online book by Jenny Bryan on how to setup and use git and " +"GitHub with specific references on the integration of git with RStudio and " +"working with git in R." # header #: git-novice/reference.md:15 @@ -10235,15 +11126,19 @@ msgstr "" #: git-novice/reference.md:23 msgid "" "commit\n" -": To record the current state of a set of files (a [changeset](#changeset))\n" -" in a [version control](#version-control) [repository](#repository). As a noun,\n" +": To record the current state of a set of files (a [changeset]" +"(#changeset))\n" +" in a [version control](#version-control) [repository](#repository). As a " +"noun,\n" " the result of committing, i.e. a recorded changeset in a repository.\n" " If a commit contains changes to multiple files,\n" " all of the changes are recorded together." msgstr "" "commit\n" -": To record the current state of a set of files (a [changeset](#changeset))\n" -" in a [version control](#version-control) [repository](#repository). As a noun,\n" +": To record the current state of a set of files (a [changeset]" +"(#changeset))\n" +" in a [version control](#version-control) [repository](#repository). As a " +"noun,\n" " the result of committing, i.e. a recorded changeset in a repository.\n" " If a commit contains changes to multiple files,\n" " all of the changes are recorded together." @@ -10251,13 +11146,15 @@ msgstr "" #: git-novice/reference.md:30 msgid "" "conflict\n" -": A change made by one user of a [version control system](#version-control)\n" +": A change made by one user of a [version control system](#version-" +"control)\n" " that is incompatible with changes made by other users.\n" " Helping users [resolve](#resolve) conflicts\n" " is one of version control's major tasks." msgstr "" "conflict\n" -": A change made by one user of a [version control system](#version-control)\n" +": A change made by one user of a [version control system](#version-" +"control)\n" " that is incompatible with changes made by other users.\n" " Helping users [resolve](#resolve) conflicts\n" " is one of version control's major tasks." @@ -10265,11 +11162,13 @@ msgstr "" #: git-novice/reference.md:36 msgid "" "HTTP\n" -": The Hypertext Transfer [Protocol](#protocol) used for sharing web pages and other data\n" +": The Hypertext Transfer [Protocol](#protocol) used for sharing web pages " +"and other data\n" " on the World Wide Web." msgstr "" "HTTP\n" -": The Hypertext Transfer [Protocol](#protocol) used for sharing web pages and other data\n" +": The Hypertext Transfer [Protocol](#protocol) used for sharing web pages " +"and other data\n" " on the World Wide Web." #: git-novice/reference.md:40 @@ -10295,33 +11194,39 @@ msgstr "" #: git-novice/reference.md:48 msgid "" "remote\n" -": (of a repository) A version control [repository](#repository) connected to another,\n" +": (of a repository) A version control [repository](#repository) connected " +"to another,\n" " in such way that both can be kept in sync exchanging [commits](#commit)." msgstr "" "remote\n" -": (of a repository) A version control [repository](#repository) connected to another,\n" +": (of a repository) A version control [repository](#repository) connected " +"to another,\n" " in such way that both can be kept in sync exchanging [commits](#commit)." #: git-novice/reference.md:52 msgid "" "repository\n" ": A storage area where a [version control](#version-control) system\n" -" stores the full history of [commits](#commit) of a project and information\n" +" stores the full history of [commits](#commit) of a project and " +"information\n" " about who changed what, when." msgstr "" "repository\n" ": A storage area where a [version control](#version-control) system\n" -" stores the full history of [commits](#commit) of a project and information\n" +" stores the full history of [commits](#commit) of a project and " +"information\n" " about who changed what, when." #: git-novice/reference.md:57 msgid "" "resolve\n" -": To eliminate the [conflicts](#conflict) between two or more incompatible changes to a file or set of files\n" +": To eliminate the [conflicts](#conflict) between two or more incompatible " +"changes to a file or set of files\n" " being managed by a [version control](#version-control) system." msgstr "" "resolve\n" -": To eliminate the [conflicts](#conflict) between two or more incompatible changes to a file or set of files\n" +": To eliminate the [conflicts](#conflict) between two or more incompatible " +"changes to a file or set of files\n" " being managed by a [version control](#version-control) system." #: git-novice/reference.md:61 @@ -10335,26 +11240,36 @@ msgstr "" #: git-novice/reference.md:64 msgid "" "SHA-1\n" -": [SHA-1 hashes](https://en.wikipedia.org/wiki/SHA-1) is what Git uses to compute identifiers, including for commits.\n" -" To compute these, Git uses not only the actual change of a commit, but also its metadata (such as date, author,\n" -" message), including the identifiers of all commits of preceding changes. This makes Git commit IDs virtually unique.\n" -" I.e., the likelihood that two commits made independently, even of the same change, receive the same ID is exceedingly\n" +": [SHA-1 hashes](https://en.wikipedia.org/wiki/SHA-1) is what Git uses to " +"compute identifiers, including for commits.\n" +" To compute these, Git uses not only the actual change of a commit, but " +"also its metadata (such as date, author,\n" +" message), including the identifiers of all commits of preceding changes. " +"This makes Git commit IDs virtually unique.\n" +" I.e., the likelihood that two commits made independently, even of the " +"same change, receive the same ID is exceedingly\n" " small." msgstr "" "SHA-1\n" -": [SHA-1 hashes](https://en.wikipedia.org/wiki/SHA-1) is what Git uses to compute identifiers, including for commits.\n" -" To compute these, Git uses not only the actual change of a commit, but also its metadata (such as date, author,\n" -" message), including the identifiers of all commits of preceding changes. This makes Git commit IDs virtually unique.\n" -" I.e., the likelihood that two commits made independently, even of the same change, receive the same ID is exceedingly\n" +": [SHA-1 hashes](https://en.wikipedia.org/wiki/SHA-1) is what Git uses to " +"compute identifiers, including for commits.\n" +" To compute these, Git uses not only the actual change of a commit, but " +"also its metadata (such as date, author,\n" +" message), including the identifiers of all commits of preceding changes. " +"This makes Git commit IDs virtually unique.\n" +" I.e., the likelihood that two commits made independently, even of the " +"same change, receive the same ID is exceedingly\n" " small." #: git-novice/reference.md:71 msgid "" "SSH\n" -": The Secure Shell [protocol](#protocol) used for secure communication between computers." +": The Secure Shell [protocol](#protocol) used for secure communication " +"between computers." msgstr "" "SSH\n" -": The Secure Shell [protocol](#protocol) used for secure communication between computers." +": The Secure Shell [protocol](#protocol) used for secure communication " +"between computers." #: git-novice/reference.md:74 msgid "" @@ -10369,13 +11284,15 @@ msgid "" "version control\n" ": A tool for managing changes to a set of files.\n" " Each set of changes creates a new [commit](#commit) of the files;\n" -" the version control system allows users to recover old commits reliably,\n" +" the version control system allows users to recover old commits " +"reliably,\n" " and helps manage conflicting changes made by different users." msgstr "" "version control\n" ": A tool for managing changes to a set of files.\n" " Each set of changes creates a new [commit](#commit) of the files;\n" -" the version control system allows users to recover old commits reliably,\n" +" the version control system allows users to recover old commits " +"reliably,\n" " and helps manage conflicting changes made by different users." # Front Matter @@ -10401,9 +11318,11 @@ msgstr "" #: git-novice/setup.md:9 msgid "" -"We'll do our work in the `Desktop` folder so make sure you change your working directory to it with:" +"We'll do our work in the `Desktop` folder so make sure you change your " +"working directory to it with:" msgstr "" -"We'll do our work in the `Desktop` folder so make sure you change your working directory to it with:" +"We'll do our work in the `Desktop` folder so make sure you change your " +"working directory to it with:" # code block #: git-novice/setup.md:11