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 episode 8 #147

Open
wants to merge 37 commits into
base: ja
Choose a base branch
from
Open

Translation of Git episode 8 #147

Changes from 19 commits
Commits
Show all changes
37 commits
Select commit Hold shift + click to select a range
3d37b7c
Translate 'Front Matter'
kozo2 Nov 23, 2020
83fa561
Translate "Front Matter"
kozo2 Nov 23, 2020
1e62697
Translated to just before "Some more about remotes"
kozo2 Jan 23, 2021
d776757
Translated to just before "Switch Roles and Repeat"
kozo2 Jan 23, 2021
a90593f
Finish translating chapter 8
kozo2 Jan 24, 2021
67d111e
Update po/git-novice.ja.po
kozo2 Aug 9, 2021
3ed7b5f
Update po/git-novice.ja.po
kozo2 Aug 9, 2021
0738ae6
Update po/git-novice.ja.po
kozo2 Aug 9, 2021
315b2eb
Update po/git-novice.ja.po
kozo2 Aug 9, 2021
2c7bdfe
Update po/git-novice.ja.po
kozo2 Aug 9, 2021
2baf995
Update po/git-novice.ja.po
kozo2 Aug 9, 2021
0cb4ae9
Update po/git-novice.ja.po
kozo2 Aug 10, 2021
c8697ec
Update po/git-novice.ja.po
kozo2 Aug 10, 2021
70037d7
Update po/git-novice.ja.po
kozo2 Aug 10, 2021
5aed9b5
Update po/git-novice.ja.po
kozo2 Aug 14, 2021
8588906
Update po/git-novice.ja.po
kozo2 Aug 14, 2021
283c730
Update po/git-novice.ja.po
kozo2 Aug 14, 2021
7ab0e59
Update git-novice.ja.po
kozo2 Aug 14, 2021
8d7bb45
Update git-novice.ja.po
kozo2 Aug 14, 2021
c29d271
Update po/git-novice.ja.po
kozo2 Nov 30, 2021
67bbcac
Update po/git-novice.ja.po
kozo2 Nov 30, 2021
bec5313
Update po/git-novice.ja.po
kozo2 Nov 30, 2021
baca4c3
Update po/git-novice.ja.po
kozo2 Nov 30, 2021
53ca41c
Update po/git-novice.ja.po
kozo2 Nov 30, 2021
13bde97
Update po/git-novice.ja.po
kozo2 Nov 30, 2021
da173be
Update po/git-novice.ja.po
kozo2 Nov 30, 2021
76514a0
Update po/git-novice.ja.po
kozo2 Nov 30, 2021
ebfbcb1
Update po/git-novice.ja.po
kozo2 Nov 30, 2021
5798024
Update po/git-novice.ja.po
kozo2 Nov 30, 2021
202bb1c
Update po/git-novice.ja.po
kozo2 Nov 30, 2021
9c020f3
Update po/git-novice.ja.po
kozo2 Nov 30, 2021
9074fe9
Update po/git-novice.ja.po
kozo2 Nov 30, 2021
27bbe2d
Update po/git-novice.ja.po
kozo2 Nov 30, 2021
13dcf91
Update po/git-novice.ja.po
kozo2 Nov 30, 2021
b9454c5
Update po/git-novice.ja.po
kozo2 Nov 30, 2021
ab802cf
Update po/git-novice.ja.po
kozo2 Nov 30, 2021
2e4c9b0
Update po/git-novice.ja.po
kozo2 Dec 1, 2021
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
196 changes: 91 additions & 105 deletions po/git-novice.ja.po
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5950,18 +5950,18 @@ msgid ""
"---"
msgstr ""
"---\n"
"title: Collaborating\n"
"title: 共同作業\n"
"teaching: 25\n"
"exercises: 0\n"
"questions:\n"
"- \"How can I use version control to collaborate with other people?\"\n"
"- \"どうすれば他の人と共同作業するためにバージョン管理を使うことができるでしょうか?\"\n"
kozo2 marked this conversation as resolved.
Show resolved Hide resolved
"objectives:\n"
"- \"Clone a remote repository.\"\n"
"- \"Collaborate pushing to a common repository.\"\n"
"- \"Describe the basic collaborative workflow.\"\n"
"- \"リモートリポジトリをクローンしましょう。\"\n"
"- \"共有リポジトリにプッシュして共同作業しましょう。\"\n"
"- \"基本的な共同作業のワークフローを説明してみましょう。\"\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` は、リモートリポジトリをコピーして、"
"`origin` というリモートが自動的に設定されたローカルリポジトリを作ります。\"\n"
kozo2 marked this conversation as resolved.
Show resolved Hide resolved
"---"

#: git-novice/_episodes/08-collab.md:15
Expand All @@ -5974,18 +5974,15 @@ msgid ""
"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"
"play Owner and Collaborator."
"次のステップから、ペアになります。1人が \"オーナー\" になり、 "
"もう1人が \"コラボレーター\" になります。目標は、コラボレーターがオーナーの "
"リポジトリに変更を追加することです。最後に役割交代して、 "
kozo2 marked this conversation as resolved.
Show resolved Hide resolved
"両方の人がオーナーとコラボレーター役を演じます。"

# blockquote, which can be cascaded
#: git-novice/_episodes/08-collab.md:20
msgid "> ## Practicing By Yourself"
msgstr "> ## Practicing By Yourself"
msgstr "> ## 一人で練習する"
kozo2 marked this conversation as resolved.
Show resolved Hide resolved

#: git-novice/_episodes/08-collab.md:21
msgid ""
Expand All @@ -5998,22 +5995,21 @@ msgid ""
"you."
msgstr ""
">\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."
"> このレッスンを一人で行っている場合は、 "
"二つ目のターミナルウィンドウを開いて続行できます。\n"
"> このウィンドウは、別のコンピューターで作業しているパートナーに相当します。\n"
"> どちらの「パートナー」もあなたであるため、"
"GitHubへのアクセスを誰にも許可する必要はありません。"
kozo2 marked this conversation as resolved.
Show resolved Hide resolved

#: git-novice/_episodes/08-collab.md:28
msgid ""
"The Owner needs to give the Collaborator access.\n"
"On GitHub, click the settings button on the right,\n"
"then select Collaborators, and enter your partner's username."
msgstr ""
"The Owner needs to give the Collaborator access.\n"
"On GitHub, click the settings button on the right,\n"
"then select Collaborators, and enter your partner's username."
"所有者はコラボレーターにアクセス権を与える必要があります。\n"
"GitHubで、右側の設定ボタンをクリックし、\n"
kozo2 marked this conversation as resolved.
Show resolved Hide resolved
"コラボレーターを選択して、パートナーのユーザー名を入力します。"

#: git-novice/_episodes/08-collab.md:32
msgid "![Adding Collaborators on GitHub](../fig/github-add-collaborators.png)"
Expand All @@ -6026,10 +6022,11 @@ msgid ""
"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"
"Once there she can accept access to the Owner's repo."
"オーナーのリポジトリへのアクセスを受け入れるには、コラボレーターは\n"
"[https://github.com/notifications](https://github.com/"
"notifications) に行く必要があります。\n"
"そこで、コラボレーターはオーナーのリポジトリへのアクセスを受け入れることが"
"できます。"

#: git-novice/_episodes/08-collab.md:38
msgid ""
Expand All @@ -6038,10 +6035,11 @@ msgid ""
" 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"
" machine. This is called \"cloning a repo\". To clone the Owner's repo into\n"
"her `Desktop` folder, the Collaborator enters:"
"次に、コラボレーターはオーナーのリポジトリのコピーを自分のパソコンにダウンロード"
"する必要があります。\n"
"これは \"リポジトリのクローンの作成\" と呼ばれます。オーナーのリポジトリを\n"
"コラボレーターの `デスクトップ` フォルダに複製するには、"
"コラボレーターは次のように入力します:"

# code block
#: git-novice/_episodes/08-collab.md:42
Expand All @@ -6056,7 +6054,7 @@ msgstr ""

#: git-novice/_episodes/08-collab.md:47
msgid "Replace 'vlad' with the Owner's username."
msgstr "Replace 「nobita」 with the Owner's username."
msgstr "「vlad」はオーナーのユーザー名に置き換えてください。"

#: git-novice/_episodes/08-collab.md:49
msgid "![After Creating Clone of Repository](../fig/github-collaboration.svg)"
Expand All @@ -6068,9 +6066,8 @@ msgid ""
"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"
"exactly the same way as we've been doing before:"
"これでコラボレーターは、これまでとまったく同じ方法で、\n"
"オーナーのリポジトリのクローンに変更を加えることができます:"

# code block
#: git-novice/_episodes/08-collab.md:54
Expand Down Expand Up @@ -6126,7 +6123,7 @@ msgstr ""

#: git-novice/_episodes/08-collab.md:78
msgid "Then push the change to the *Owner's repository* on GitHub:"
msgstr "Then push the change to the *Owner's repository* on GitHub:"
msgstr "次に、変更をGitHubの *オーナーのリポジトリ* にプッシュします:"
kozo2 marked this conversation as resolved.
Show resolved Hide resolved

# code block
#: git-novice/_episodes/08-collab.md:85
Expand Down Expand Up @@ -6157,9 +6154,10 @@ msgid ""
"name by default when we clone a repository. (This is why `origin` was a\n"
"sensible choice earlier when we were setting up remotes by hand.)"
msgstr ""
"Note that we didn't have to create a remote called `origin`: Git uses this\n"
"name by default when we clone a repository. (This is why `origin` was a\n"
"sensible choice earlier when we were setting up remotes by hand.)"
"`origin`と呼ばれるリモートを作成する必要がなかったことに注意してください: \n"
"リポジトリのクローンを作成するとき、Gitはデフォルトでこの名前を使用します。\n"
kozo2 marked this conversation as resolved.
Show resolved Hide resolved
"(これが、私たちが先程手動でリモートをセットアップしていたときに、\n"
"`origin`が賢明な選択であった理由です。)"

#: git-novice/_episodes/08-collab.md:100
msgid ""
Expand All @@ -6169,17 +6167,16 @@ msgid ""
"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"
"Collaborator."
"GitHub のwebサイトでオーナーのリポジトリを確認してください "
kozo2 marked this conversation as resolved.
Show resolved Hide resolved
"(ブラウザを更新する必要があるかもしれません。)\n"
"コラボレーターによって行われた新しいコミットを確認できるはずです。"

#: git-novice/_episodes/08-collab.md:104
msgid ""
"To download the Collaborator's changes from GitHub, the Owner now enters:"
msgstr ""
"To download the Collaborator's changes from GitHub, the Owner now enters:"
"コラボレーターの変更をGitHubからダウンロードするためには、"
kozo2 marked this conversation as resolved.
Show resolved Hide resolved
"オーナーは次のように入力します:"

# code block
#: git-novice/_episodes/08-collab.md:111
Expand Down Expand Up @@ -6218,14 +6215,13 @@ msgid ""
"on\n"
"GitHub) are back in sync."
msgstr ""
"Now the three repositories (Owner's local, Collaborator's local, and Owner's "
"on\n"
"GitHub) are back in sync."
"これで、3つのリポジトリ (オーナーのローカル、コラボレーターのローカル、"
"オーナーのGitHub上のもの) が同期している状態に戻りました。"
kozo2 marked this conversation as resolved.
Show resolved Hide resolved

# blockquote, which can be cascaded
#: git-novice/_episodes/08-collab.md:129
msgid "> ## A Basic Collaborative Workflow"
msgstr "> ## A Basic Collaborative Workflow"
msgstr "> ## 基本的なコラボレーションワークフロー"

#: git-novice/_episodes/08-collab.md:130
msgid ""
Expand All @@ -6246,38 +6242,37 @@ 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"
"> our changes. The basic collaborative workflow would be:\n"
"> 実際には、コラボレーションしているリポジトリが最新状態になっていることを"
"> 確認することをお勧めします。"
"> そのため、変更を加える前に `git pull` を実行する必要があります。"
"> 基本的なコラボレーションワークフローは次のとおりです:\n"
">\n"
"> * update your local repo with `git pull origin master`,\n"
"> * make your changes and stage them with `git add`,\n"
"> * commit your changes with `git commit -m`, and\n"
"> * upload the changes to GitHub with `git push origin master`\n"
"> * `git pull origin master` でローカルリポジトリを更新する、\n"
"> * 変更をしてそれを `git add` でステージングする、\n"
"> * `git commit -m` で変更をコミットする、そして\n"
"> * `git push origin master` で変更をGitHubにアップロードする\n"
kozo2 marked this conversation as resolved.
Show resolved Hide resolved
">\n"
"> It is better to make many commits with smaller changes rather than\n"
"> of one commit with massive changes: small commits are easier to\n"
"> read and review."
"> 大規模な変更を伴う1つのコミットよりも、"
"> 小さな変更を伴う多くのコミットを行う方が良いです:"
"> 小さなコミットは、読みやすく、レビューしやすいです。"

# blockquote, which can be cascaded
#: git-novice/_episodes/08-collab.md:145
msgid "> ## Switch Roles and Repeat"
msgstr "> ## Switch Roles and Repeat"
msgstr "> ## 役割交代して同じことを繰り返しましょう"

#: git-novice/_episodes/08-collab.md:146
msgid ""
">\n"
"> Switch roles and repeat the whole process."
msgstr ""
">\n"
"> Switch roles and repeat the whole process."
"> 役割交代して、プロセス全体を繰り返しましょう。"

# blockquote, which can be cascaded
#: git-novice/_episodes/08-collab.md:150
msgid "> ## Review Changes"
msgstr "> ## Review Changes"
msgstr "> ## 変更をレビューしましょう"

#: git-novice/_episodes/08-collab.md:151
msgid ""
Expand Down Expand Up @@ -6311,38 +6306,30 @@ msgid ""
"> > 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"
"> command line? And on GitHub?\n"
"> オーナーはコラボレーターに情報を提供せずに、"
"> コミットをリポジトリにプッシュしました。"
"> どのようにしてコラボレーターは何が変更されたかをコマンドラインで、"
"> またはGitHubで見つけることができるでしょうか?\n"
kozo2 marked this conversation as resolved.
Show resolved Hide resolved
">\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"
"> > 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"
"> > 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"
"> > 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"
"> > that are different."
"> > ## 解答\n"
"> > コマンドラインで、コラボレーターは```git fetch origin master```\n"
"> > を使用してマージすることなくリモートの変更をローカルリポジトリに"
"> > 取得できます。次に ```git diff master origin/master``` を実行すると、"
"> > コラボレーターはターミナルに出力された変更を確認できます。\n"
"> >\n"
"> > GitHubで、コラボレーターはリポジトリの自分のフォークに移動し、薄い青の最近のコミットのバーのすぐ上に"
kozo2 marked this conversation as resolved.
Show resolved Hide resolved
"> > \"This branch is 1 commit behind Our-Repository:master.\" "
"> > と言っているグレーのバーを見つけることができます。"
"> > そのグレーのバーの右側には比較のためのアイコンとリンクがあります。"
"> > その比較を行うページで、コラボレーターはベースフォークを"
"> > 自分のリポジトリに変更し、\"compare across forks\"の上の段落のリンクを"
"> > クリックし、最後にヘッドフォークをメインリポジトリに変更する"
"> > 必要があります。これにより、異なるすべてのコミットが表示されます。"

# blockquote, which can be cascaded
#: git-novice/_episodes/08-collab.md:173
msgid "> ## Comment Changes in GitHub"
msgstr "> ## Comment Changes in GitHub"
msgstr "> ## GitHubでのコメントの変更"
kozo2 marked this conversation as resolved.
Show resolved Hide resolved

#: git-novice/_episodes/08-collab.md:174
msgid ""
Expand All @@ -6358,20 +6345,20 @@ msgid ""
"> 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"
"> has some suggestions to propose.\n"
"> コラボレーターは、オーナーによって行われたある行の変更について"
"> いくつか質問があり、またいくつかの提案があるとします。\n"
">\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"
"> GitHubを使用すると、コミットの差分にコメントすることができます。"
kozo2 marked this conversation as resolved.
Show resolved Hide resolved
"> コメントするコードの行の上に、"
"> コメントウィンドウを開くための青いコメントアイコンが表れます。"
">\n"
"> The Collaborator posts its comments and suggestions using GitHub interface."
"> コラボレーターは、GitHubのインターフェースを使用して"
kozo2 marked this conversation as resolved.
Show resolved Hide resolved
"> コメントや提案を投稿します。"

# blockquote, which can be cascaded
#: git-novice/_episodes/08-collab.md:184
msgid "> ## Version History, Backup, and Version Control"
msgstr "> ## Version History, Backup, and Version Control"
msgstr "> ## バージョン履歴、バックアップ、およびバージョン管理"

#: git-novice/_episodes/08-collab.md:185
msgid ""
Expand All @@ -6383,11 +6370,10 @@ msgid ""
"> 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"
"> What are some of the benefits of using version control, Git and GitHub?"
"> 一部のバックアップソフトウェアは、ファイルのバージョンの履歴を保持できます。"
"また、特定のバージョンを回復することもできます。\n"
"> この機能はバージョン管理とどのように異なるでしょうか?\n"
"> バージョン管理、GitおよびGitHubを使用する利点は何でしょうか?"
kozo2 marked this conversation as resolved.
Show resolved Hide resolved

# Front Matter
#: git-novice/_episodes/09-conflict.md:1
Expand Down