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

#63 Translate git-novice Section 3 #113

Merged
merged 12 commits into from
Oct 11, 2020
Merged

#63 Translate git-novice Section 3 #113

Changes from 1 commit
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
4712574
Translate git-novice Section 3
kozo2 Aug 22, 2020
88073b7
Update po/git-novice.ja.po
kozo2 Aug 31, 2020
cc9a17f
Update po/git-novice.ja.po
kozo2 Aug 31, 2020
c4265bb
Update po/git-novice.ja.po
kozo2 Aug 31, 2020
3c8d8a7
Update po/git-novice.ja.po
kozo2 Aug 31, 2020
66ce6b4
Update po/git-novice.ja.po
kozo2 Aug 31, 2020
19e93b4
Update po/git-novice.ja.po
kozo2 Aug 31, 2020
9116503
Update po/git-novice.ja.po
kozo2 Aug 31, 2020
9ff9fae
Update po/git-novice.ja.po
kozo2 Aug 31, 2020
cf2f292
Update po/git-novice.ja.po
kozo2 Aug 31, 2020
84b9305
Translate the front-matter
kozo2 Aug 31, 2020
1aa01e4
Update po/git-novice.ja.po
kozo2 Sep 2, 2020
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
119 changes: 55 additions & 64 deletions po/git-novice.ja.po
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1556,16 +1556,16 @@ msgid ""
"Once Git is configured,\n"
"we can start using it."
msgstr ""
"Once Git is configured,\n"
"we can start using it."
"Gitが設定されたら、\n"
kozo2 marked this conversation as resolved.
Show resolved Hide resolved
"それを使い始めることができます。"

#: 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:"
msgstr ""
"First, let's create a directory in `Desktop` folder for our work and then "
"move into that directory:"
"まず、`Desktop`フォルダーに作業用のディレクトリを作成し、"
"そのディレクトリに移動しましょう:"

# code block
#: git-novice/_episodes/03-create.md:19
Expand All @@ -1588,9 +1588,9 @@ msgid ""
"reference#repository)—a place where\n"
"Git can store versions of our files:"
msgstr ""
"Then we tell Git to make `planets` a [repository]({{ page.root }}/"
"reference#repository)—a place where\n"
"Git can store versions of our files:"
"次に、Gitに`planets`を[リポジトリ]({{ page.root }}/"
"reference#repository)—\n"
"Gitがファイルのバージョンを保存できる場所:にするように伝えます。"
kozo2 marked this conversation as resolved.
Show resolved Hide resolved

# code block
#: git-novice/_episodes/03-create.md:29
Expand All @@ -1608,8 +1608,8 @@ msgid ""
"If we use `ls` to show the directory's contents,\n"
"it appears that nothing has changed:"
msgstr ""
"If we use `ls` to show the directory's contents,\n"
"it appears that nothing has changed:"
"`ls` を使ってディレクトリの内容を表示すると、\n"
"何も変更されていないように見えます:"

# code block
#: git-novice/_episodes/03-create.md:37 git-novice/_episodes/04-changes.md:57
Expand All @@ -1628,9 +1628,9 @@ msgid ""
"we can see that Git has created a hidden directory within `planets` called `."
"git`:"
msgstr ""
"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`:"
"ですが `-a` フラグを追加してすべてを表示すると、\n"
"Git が `."
"git`という隠しディレクトリを `planets` の中に作ったことがわかります: "

# code block
#: git-novice/_episodes/03-create.md:45
Expand Down Expand Up @@ -1720,20 +1720,19 @@ msgid ""
"If we ever delete the `.git` sub-directory,\n"
"we will lose the project's history."
msgstr ""
"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."
"Git はプロジェクトのディレクトリ内にあるすべてのファイルとサブディレクトリを含む、"
"プロジェクトに関するすべての情報を格納するためにこの特別なサブディレクトリを "
"使用します。\n"
"`.git` サブディレクトリを削除すると、\n"
"プロジェクトの履歴を失うことになります。"

#: git-novice/_episodes/03-create.md:60
msgid ""
"We can check that everything is set up correctly\n"
"by asking Git to tell us the status of our project:"
msgstr ""
"We can check that everything is set up correctly\n"
"by asking Git to tell us the status of our project:"
"プロジェクトのステータスをGitに問うことで、\n"
"すべてが正しく設定されていることを確認できます:"

# code block
#: git-novice/_episodes/03-create.md:63 git-novice/_episodes/04-changes.md:80
Expand All @@ -1758,8 +1757,8 @@ msgid ""
"If you are using a different version of `git`, the exact\n"
"wording of the output might be slightly different."
msgstr ""
"If you are using a different version of `git`, the exact\n"
"wording of the output might be slightly different."
"異なるバージョンの `git` を使用している場合、\n"
kozo2 marked this conversation as resolved.
Show resolved Hide resolved
"出力の正確な表現は少し異なっているかもしれません。"
kozo2 marked this conversation as resolved.
Show resolved Hide resolved

# code block
#: git-novice/_episodes/03-create.md:71
Expand All @@ -1783,7 +1782,7 @@ msgstr ""
# blockquote, which can be cascaded
#: git-novice/_episodes/03-create.md:80
msgid "> ## Places to Create Git Repositories"
msgstr "> ## Places to Create Git Repositories"
msgstr "> ## Git リポジトリを作るための場所"
kozo2 marked this conversation as resolved.
Show resolved Hide resolved

#: git-novice/_episodes/03-create.md:81
msgid ""
Expand Down Expand Up @@ -1848,54 +1847,46 @@ msgid ""
"> > {: .output}"
msgstr ""
">\n"
"> Along with tracking information about planets (the project we have already "
"created), \n"
"> のび太 would also like to track information about moons.\n"
"> Despite ドラえもん's concerns, のび太 creates a `moons` project inside his "
"`planets` \n"
"> project with the following sequence of commands:\n"
"> planets (すでに作成したプロジェクト) "
"についての追跡情報と共に、 \n"
kozo2 marked this conversation as resolved.
Show resolved Hide resolved
"> のび太 は moons についての情報も追跡したいと考えています。\n"
kozo2 marked this conversation as resolved.
Show resolved Hide resolved
"> ドラえもん の心配にもかかわらず、のび太 は次の一連のコマンドを使って、"
kozo2 marked this conversation as resolved.
Show resolved Hide resolved
"彼の `planets` \n"
"> プロジェクト内に `moons` プロジェクトを作ります:\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"
"> $ 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"
"> $ cd ~/Desktop # Desktop ディレクトリに戻ります\n"
"> $ cd planets # すでに Git リポジトリである planets ディレクトリ"
"移動します\n"
"> $ ls -a # .git サブディレクトリがまだ planets ディレクトリに"
"存在することを確認します\n"
"> $ mkdir moons # サブディレクトリ planets/moons を作ります\n"
"> $ cd moons # moons サブディレクトリに移動します\n"
"> $ git init # moons サブディレクトリをGitリポジトリにします\n"
"> $ ls -a # .git サブディレクトリが存在し、"
"新しいGitリポジトリが作られたと示していることを確認します。\n"
"> ~~~\n"
"> {: .language-bash}\n"
">\n"
"> Is the `git init` command, run inside the `moons` sub-directory, required "
"for \n"
"> tracking files stored in the `moons` sub-directory?\n"
"> `git init` コマンドは、`moons` サブディレクトリ内で実行され、"
"> `moons` サブディレクトリに保存されているファイルを追跡するために必要でしょうか?\n"
"> \n"
"> > ## Solution\n"
"> >\n"
"> > No. のび太 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, のび太 only needed to add the `moons` sub-"
"directory\n"
"> > to the `planets` directory.\n"
"> > ## 解答\n"
"> >\n"
"> > いいえ。のび太 は `moons` サブディレクトリを Git リポジトリにする"
kozo2 marked this conversation as resolved.
Show resolved Hide resolved
"必要はありません。 \n"
"> > `planets` リポジトリは、`planets` ディレクトリの下のすべてのファイル、サブディレクトリ、"
"> > およびサブディレクトリファイルを追跡するからです。従って、"
"> > moons についてのすべての情報を追跡するのは、のび太が `moons` サブディレクトリを"
kozo2 marked this conversation as resolved.
Show resolved Hide resolved
"> > `planets` ディレクトリに追加するだけで済みます。\n"
"> > \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"
"> > above:\n"
"> > それと、Git リポジトリが\"入れ子にされている\"場合、Gitリポジトリは"
"互いに干渉する可能性があります:\n"
"> > 外側のリポジトリは内側のリポジトリのバージョン管理を\n"
"> > しようとします。したがって、新しいGitリポジトリはそれぞれ\n"
"> > 別のディレクトリに作るのがベストです。ディレクトリに競合するリポジトリが"
"> > がないことを確認するには、`git status`の出力を確認します。次のような場合は、"
"> > 上の方で示したように新しいリポジトリを作ることをお勧めします:\n"
"> >\n"
"> > ~~~\n"
"> > $ git status\n"
Expand Down