Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Translation of git - lesson 1 #37

Merged
merged 4 commits into from
Dec 24, 2019
Merged

Translation of git - lesson 1 #37

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
7e07552
Started translating first git lesson
rikutakei Mar 13, 2019
6830c72
finished translating git-novice/_episodes/01-basics.md
rikutakei Mar 26, 2019
c4f2fce
applied suggested changes
rikutakei Aug 1, 2019
d88ade2
Merge branch 'ja' into riku-git1
rikutakei Dec 24, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
145 changes: 59 additions & 86 deletions po/git-novice.ja.po
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -817,17 +817,17 @@ msgid ""
"---"
msgstr ""
"---\n"
"title: Automated Version Control\n"
"title: 自動的なバージョン管理\n"
"teaching: 5\n"
"exercises: 0\n"
"questions:\n"
"- \"What is version control and why should I use it?\"\n"
"objectives:\n"
"- \"Understand the benefits of an automated version control system.\"\n"
"- \"Understand the basics of how Git works.\"\n"
"keypoints:\n"
"- \"Version control is like an unlimited 'undo'.\"\n"
"- \"Version control also allows many people to work in parallel.\"\n"
"疑問:\n"
"- \"バージョン管理って何？なんで必要なの？\"\n"
"目的:\n"
"- \"自動的なバージョン管理システムの利点を理解する。\"\n"
"- \"Gitの基本を理解する。\"\n"
"まとめ:\n"
"- \"バージョン管理とは、制限無く「元に戻す」ことができる機能。\"\n"
"- \"バージョン管理を使えば、複数の人と同時進行で作業をする事が出来る。\"\n"
"---"

#: git-novice/_episodes/01-basics.md:15
Expand All @@ -837,10 +837,10 @@ msgid ""
"Even if you aren't collaborating with other people,\n"
"automated version control is much better than this situation:"
rikutakei marked this conversation as resolved.
Show resolved Hide resolved
msgstr ""
"We'll start by exploring how version control can be used\n"
"to keep track of what one person did and when.\n"
"Even if you aren't collaborating with other people,\n"
"automated version control is much better than this situation:"
"それではまず、どのようにしてバージョン管理システムが\n"
"「いつ」、「何」を、「誰」が編集したのかを記録・管理しているかを見ていきましょう。\n"
"他の人と共同作業をしていなくても、\n"
"以下の状況に陥るより、自動的なバージョン管理を使うほうが大分良いはずです："

#: git-novice/_episodes/01-basics.md:20
msgid ""
Expand All @@ -854,7 +854,7 @@ msgstr ""

#: git-novice/_episodes/01-basics.md:22
msgid "\"Piled Higher and Deeper\" by Jorge Cham, http://www.phdcomics.com"
msgstr "\"Piled Higher and Deeper\" by Jorge Cham, http://www.phdcomics.com"
msgstr "「高く、深く積み上げる」Jorge Cham 作、http://www.phdcomics.com"

#: git-novice/_episodes/01-basics.md:24
msgid ""
Expand All @@ -868,15 +868,11 @@ msgid ""
"LibreOffice's [Recording and Displaying Changes](https://help.libreoffice."
"org/Common/Recording_and_Displaying_Changes)."
msgstr ""
"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)."
"皆さんもこんな経験をされたことがあるはずです。複数の、（それもほとんど\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"
"こういった状況にある程度うまく対応できるものもあります。"

#: git-novice/_episodes/01-basics.md:30
msgid ""
Expand All @@ -887,12 +883,10 @@ msgid ""
"document and play back each change you made, eventually arriving at your\n"
"more recent version."
msgstr ""
"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"
"document and play back each change you made, eventually arriving at your\n"
"more recent version."
"バージョン管理システムは、基礎となるドキュメントを元に、\n"
"加えられた全ての変更点を記録していきます。ドキュメントの\n"
"進歩を記録していると考えてもらって構いません。変更点を最初の状況まで\n"
"戻してから、最新版になるまでの変更を一つずつ再現していくことができます。"

#: git-novice/_episodes/01-basics.md:36
msgid "![Changes Are Saved Sequentially](../fig/play-changes.svg)"
Expand All @@ -907,24 +901,20 @@ msgid ""
"make independent\n"
"sets of changes on the same document. "
msgstr ""
"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"
"sets of changes on the same document. "
"「変更点」と「ドキュメント」を別々の物として考えてみると、基礎となるドキュメントに\n"
"異なる変更点を「再現」する事によって、結果的に違ったバージョンのドキュメントを\n"
"作る事が可能だという事が分かります。例えば、下の図のように二人のユーザーが同じドキュメントに\n"
"違った編集を加えた場合です。"


#: git-novice/_episodes/01-basics.md:43
msgid "![Different Versions Can be Saved](../fig/versions.svg)"
msgstr "![Different Versions Can be Saved](../fig/versions.svg)"

#: git-novice/_episodes/01-basics.md:45
msgid ""
"Unless there are conflicts, you can even incorporate two sets of changes "
"into the same base document."
msgstr ""
"Unless there are conflicts, you can even incorporate two sets of changes "
"into the same base document."
msgid "Unless there are conflicts, you can even incorporate two sets of changes into the same base document."
msgstr "変更点の衝突（コンフリクト）が無ければ、二つ以上の違った変更点を基礎ドキュメントに加えることさえできます。"


#: git-novice/_episodes/01-basics.md:47
msgid "![Multiple Versions Can be Merged](../fig/merge.svg)"
Expand All @@ -935,35 +925,25 @@ msgid ""
"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"
"complete history of commits for a particular project and their metadata make "
"up\n"
"a [repository]({{ page.root }}/reference#repository). Repositories can be "
"kept in sync\n"
"across different computers, facilitating collaboration among different "
"people."
"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"
"complete history of commits for a particular project and their metadata make up\n"
"a [repository]({{ page.root }}/reference#repository). Repositories can be kept in sync\n"
"across different computers, facilitating collaboration among different people."
msgstr ""
"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"
"complete history of commits for a particular project and their metadata make "
"up\n"
"a [repository]({{ page.root }}/reference#repository). Repositories can be "
"kept in sync\n"
"across different computers, facilitating collaboration among different "
"people."
"バージョン管理システムは、ユーザーがドキュメントに加えた変更点を記録するツールであり、\n"
"結果的にドキュメントの違ったバージョンを作成する事ができます。このツールを活用\n"
"する事によって、次のバージョンに加える変更点（個々の変更点は\n"
"[「commit（コミット）」]({{ page.root }}/reference#commit)と呼びます）を決める事ができ、変更点に関するメタデータも一緒に保存する事ができます。\n"
"特定のプロジェクトのコミット履歴とそれに関するメタデータを総じて\n"
"[「repository（レポジトリ）」]({{ page.root }}/reference#repository)と呼びます。レポジトリは\n"
"別々のコンピュータと同期させる事が出来るので、他人との共同作業を潤滑に進めることが可能になります。"


# blockquote, which can be cascaded
#: git-novice/_episodes/01-basics.md:57
msgid "> ## The Long History of Version Control Systems"
msgstr "> ## バージョンコントールシステムの長い歴史"
msgstr "> ## バージョン管理システムの長い歴史"

#: git-novice/_episodes/01-basics.md:58
msgid ""
Expand All @@ -982,18 +962,14 @@ msgid ""
"> the same files concurrently."
msgstr ""
">\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"
"> the same files concurrently."
"> 自動化されたバージョン管理システムは最近発明されたものではありません。\n"
"> RCS、CVS、Subversionなどのツールは1980年前半から存在しており、多くの会社に使われていました。\n"
"> しかし、これらのツールでは出来る事に制限があり、多くはもう時代遅れとされています。\n"
"> 現代使われているシステム、例えばGitや[Mercurial](https://swcarpentry.github.io/hg-novice/)、は\n"
"> *分散*されています。というのは、特定のサーバーを必要とせずにシステムをホストする事が出来るという事です。\n"
"> 現代のシステムには大変便利で効果的な「merge（マージ）」機能が備われており、同じファイルを\n"
"> 複数人で作業する事が可能になりました。"


# SC/DC Template label
#: git-novice/_episodes/01-basics.md:66 git-novice/_episodes/02-setup.md:70
Expand All @@ -1020,7 +996,7 @@ msgstr "{: .callout}"
# blockquote, which can be cascaded
#: git-novice/_episodes/01-basics.md:68
msgid "> ## Paper Writing"
msgstr "> ## Paper Writing"
msgstr "> ## 論文を書くにあたって"

#: git-novice/_episodes/01-basics.md:69
msgid ""
Expand All @@ -1036,15 +1012,12 @@ msgid ""
"> `Track Changes` option? Do you have a history of those changes?"
msgstr ""
">\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"
"> どうしたら以前書いた文章を取り戻すことができるのでしょう？そもそも、可能なのでしょうか？\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"
"> `Track Changes` option? Do you have a history of those changes?"
"> * 五人の共著者がいるとします。どうやって全員の変更やコメントを管理すれば良いのでしょう？\n"
"> LibreOffice WriterやMicrosoft Wordの場合、こういった変更やコメントを変更履歴機能で受け入れると\n"
"> どうなるのでしょう？変更点は記録されるのでしょうか？"

# SC/DC Template label
#: git-novice/_episodes/01-basics.md:76 git-novice/_episodes/03-create.md:127
Expand Down