Merge pull request #107 from rikutakei/riku-git2

Translation of Git episode 2
swcarpentry-ja · Nov 10, 2020 · 8227e94 · 8227e94
2 parents edf7a27 + 68d133e
commit 8227e94
Showing 1 changed file with 65 additions and 87 deletions.
diff --git a/po/git-novice.ja.po b/po/git-novice.ja.po
@@ -1053,17 +1053,17 @@ msgid ""
 "---"
 msgstr ""
 "---\n"
-"title: Setting Up Git\n"
+"title: Git の設定\n"
 "teaching: 5\n"
 "exercises: 0\n"
 "questions:\n"
-"- \"How do I get set up to use Git?\"\n"
-"objectives:\n"
-"- \"Configure `git` the first time it is used on a computer.\"\n"
-"- \"Understand the meaning of the `--global` configuration flag.\"\n"
+"- Git を使うために必要な設定は何ですか？\n"
+"objectives: \n"
+"- コンピュータで初めて `git` を使うための設定が出来るようになりましょう。\n"
+"- `--global` 設定フラグの意味を理解しましょう。\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"
+"-   \"`git config` と `--global` オプションを使い、ユーザー名\n"
+"メールアドレス、エディタ、その他の設定を行う。"
 "---"
 
 #: git-novice/_episodes/02-setup.md:14
@@ -1072,36 +1072,34 @@ msgid ""
 "we need to configure a few things. Below are a few examples\n"
 "of configurations we will set as we get started with Git:"
 msgstr ""
-"When we use Git on a new computer for the first time,\n"
-"we need to configure a few things. Below are a few examples\n"
-"of configurations we will set as we get started with Git:"
+"Git を新しいパソコンで初めて使う場合、\n"
+"いくつかの設定を変更しなければなりません。Git を始めるにあたって、\n"
+"私達が変更する設定をいくつか表記します："
 
 # unordered list
 #: git-novice/_episodes/02-setup.md:18
 msgid "*   our name and email address,"
-msgstr "*   our name and email address,"
+msgstr "*   名前とメールアドレス、"
 
 # unordered list
 #: git-novice/_episodes/02-setup.md:19
 msgid "*   what our preferred text editor is,"
-msgstr "*   what our preferred text editor is,"
+msgstr "*   使用したいテキストエディタ、"
 
 # unordered list
 #: git-novice/_episodes/02-setup.md:20
-msgid ""
-"*   and that we want to use these settings globally (i.e. for every project)."
-msgstr ""
-"*   and that we want to use these settings globally (i.e. for every project)."
+msgid "*   and that we want to use these settings globally (i.e. for every project)."
+msgstr "*   以上の設定をグローバル設定として使う（つまり、全てのプロジェクトに反映させる）。"
 
 #: git-novice/_episodes/02-setup.md:22
 msgid ""
 "On a command line, Git commands are written as `git verb`,\n"
 "where `verb` is what we actually want to do. So here is how\n"
 "Dracula sets up his new laptop:"
 msgstr ""
-"On a command line, Git commands are written as `git verb`,\n"
-"where `verb` is what we actually want to do. So here is how\n"
-"のび太 sets up his new laptop:"
+"コマンドラインでは、Git コマンドは `git <動詞>` と入力します。\n"
+"ここでの「動詞」は、Git に何をさせたいのかを表します。ドラキュラが新しいユーザーの場合、\n"
+"以下のようにコンピュータを設定します："
 
 # code block
 #: git-novice/_episodes/02-setup.md:26
@@ -1112,8 +1110,8 @@ msgid ""
 "~~~"
 msgstr ""
 "~~~\n"
-"$ git config --global user.name “野比 のび太\"\n"
-"$ git config --global user.email “[email protected]”\n"
+"$ git config --global user.name \"Vlad Dracula\"\n"
+"$ git config --global user.email \"[email protected]\"\n"
 "~~~"
 
 #: git-novice/_episodes/02-setup.md:30 git-novice/_episodes/02-setup.md:110
@@ -1200,19 +1198,18 @@ msgid ""
 "another Git host server\n"
 "in a later lesson will include this information."
 msgstr ""
-"Please use your own name and email address instead of のび太'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"
-"[GitLab](https://gitlab.com/) or\n"
-"another Git host server\n"
-"in a later lesson will include this information."
+"ここでは、ドラキュラの代わりに自分の名前とメールアドレスを使いましょう。ここで入力した名前とメールアドレスは、これから行う Git での作業に関わってきます。\n"
+"というのも、これからのレッスンで\n"
+"[GitHub](https://github.com/)、\n"
+"[BitBucket](https://bitbucket.org/)、\n"
+"[GitLab](https://gitlab.com/)、または\n"
+"その他の Git をホストするサーバーに\n"
+"変更箇所を「プッシュ」した（送った）際に、これらの情報が使われるからです。"
 
 # blockquote, which can be cascaded
 #: git-novice/_episodes/02-setup.md:40
 msgid "> ## Line Endings"
-msgstr "> ## Line Endings"
+msgstr "> ## 改行コード"
 
 #: git-novice/_episodes/02-setup.md:41
 msgid ""
@@ -1248,61 +1245,54 @@ msgid ""
 "endings/)."
 msgstr ""
 ">\n"
-"> As with other keys, when you hit <kbd>Return</kbd> on your keyboard,\n"
-"> your computer encodes this input as a character.\n"
-"> For reasons that are long to explain, different operating systems\n"
-"> use different character(s) to represent the end of a line.\n"
-"> (You may also hear these referred to as newlines or line breaks.)\n"
-"> Because Git uses these characters to compare files,\n"
-"> it may cause unexpected issues when editing a file on different machines.\n"
+"> 他のキーと同様に、<kbd>Return</kbd> キーを押すと、\n"
+"> コンピュータはそれを文字として入力します。\n"
+"> 話が長くなるので詳しい説明は省きますが、行末に使われる文字は\n"
+"> オペレーティングシステム（OS）よって違います。\n"
+"> （行末に使われる文字を「改行コード」と呼びます。）\n"
+"> Git は、改行コードを使ってファイルの違いを確かめるため、\n"
+"> 違うパソコンでファイルを編集した時に思わぬ問題が起こるかもしれません。\n"
 ">\n"
-"> You can change the way Git recognizes and encodes line endings\n"
-"> using the `core.autocrlf` command to `git config`.\n"
-"> The following settings are recommended:\n"
+"> Git がどのように改行コードを理解・変換するかは、\n"
+"> `git config` の `core.autocrlf` コマンドを使って変更できます。\n"
+"> 以下の設定をおすすめします：\n"
 ">\n"
-"> On macOS and Linux:\n"
+"> MacOS と Linux：\n"
 ">\n"
 "> ~~~\n"
 "> $ git config --global core.autocrlf input\n"
 "> ~~~\n"
 "> {: .language-bash}\n"
 ">\n"
-"> And on Windows:\n"
+"> Windows：\n"
 ">\n"
 "> ~~~\n"
 "> $ git config --global core.autocrlf true\n"
 "> ~~~\n"
 "> {: .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/)."
+"> この問題についてもっと詳しく知りたければ、 \n"
+"> [こちらの GitHub ページ](https://help.github.com/articles/dealing-with-line-endings/)\n"
+"を参照してください。"
 
 #: 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"
+"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. `[email protected]."
 "github.com` replacing `username` with your GitHub one. You can change the "
 "email address later on by using the `git config` command again."
 msgstr ""
-"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. `[email protected]."
-"github.com` replacing `username` with your GitHub one. You can change the "
-"email address later on by using the `git config` command again."
+"これらのレッスンでは、[GitHub](https://github.com/) に接続するので、GitHub アカウントと同じメールアドレスに設定してください。プライバシーについて気になる方は、[GitHub のメールアドレスをプライベートにするための説明][git-privacy] を参照してください。\n"
+"GitHub が提供するプライベートメールアドレスを使う場合は、同じメールアドレスを `user.email` の値に設定してください（例：`[email protected]`）。メールアドレスは `git config` コマンドでいつでも変えることができます。"
 
 #: git-novice/_episodes/02-setup.md:75
 msgid "Dracula also has to set his favorite text editor, following this table:"
-msgstr "のび太 also has to set his favorite text editor, following this table:"
+msgstr "以下の表を参考に、ドラキュラはテキストエディタも設定しました："
 
 #: git-novice/_episodes/02-setup.md:77
 msgid ""
@@ -1332,7 +1322,7 @@ msgid ""
 "| Emacs              | `$ git config --global core.editor \"emacs\"`   |\n"
 "| Vim                | `$ git config --global core.editor \"vim\"`   |"
 msgstr ""
-"| Editor             | Configuration command                            |\n"
+"| エディタ             | 設定コマンド                            |\n"
 "|:-------------------|:-------------------------------------------------|\n"
 "| Atom | `$ git config --global core.editor \"atom --wait\"`|\n"
 "| nano               | `$ git config --global core.editor \"nano -w\"`    |\n"
@@ -1359,17 +1349,13 @@ msgstr ""
 "| Vim                | `$ git config --global core.editor \"vim\"`   |"
 
 #: git-novice/_episodes/02-setup.md:93
-msgid ""
-"It is possible to reconfigure the text editor for Git whenever you want to "
-"change it."
-msgstr ""
-"It is possible to reconfigure the text editor for Git whenever you want to "
-"change it."
+msgid "It is possible to reconfigure the text editor for Git whenever you want to change it."
+msgstr "設定したテキストエディタもいつでも変更することができます。"
 
 # blockquote, which can be cascaded
 #: git-novice/_episodes/02-setup.md:95
 msgid "> ## Exiting Vim"
-msgstr "> ## Vimの終了の仕方"
+msgstr "> ## Vim の終了の仕方"
 
 #: git-novice/_episodes/02-setup.md:96
 msgid ""
@@ -1382,12 +1368,9 @@ msgid ""
 "`:wq` and hit <kbd>Return</kbd>."
 msgstr ""
 ">\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 <kbd>Esc</kbd> then type `:q!` and hit <kbd>Return</"
-"kbd>.\n"
-"> If you want to save your changes and quit, press <kbd>Esc</kbd> then type "
-"`:wq` and hit <kbd>Return</kbd>."
+"> 多くのソフトの初期設定では、Vim がデフォルトのテキストエディタに設定されています。保存せずに Vim を終了するには、\n"
+" <kbd>Esc</kbd> キーを押した後に `:q!` と入力してから <kbd>Return</kbd> キーを押してください。\n"
+"> 保存してから終了するには、 <kbd>Esc</kbd> キーを押してから `:wq` と入力して <kbd>Return</kbd> キーを押してください。"
 
 #: git-novice/_episodes/02-setup.md:102
 msgid ""
@@ -1396,14 +1379,12 @@ msgid ""
 "to use the settings for every project, in your user account, on this "
 "computer."
 msgstr ""
-"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."
+"上記の4つのコマンドは、一度実行するだけで十分です。`--global` フラグは Git に、\n"
+"今使っているパソコン内にある自分のアカウントに関連する全てのプロジェクトに同じ設定をするように指示しています。"
 
 #: git-novice/_episodes/02-setup.md:105
 msgid "You can check your settings at any time:"
-msgstr "You can check your settings at any time:"
+msgstr "自分の設定はいつでも確認できます："
 
 # code block
 #: git-novice/_episodes/02-setup.md:107
@@ -1421,13 +1402,13 @@ msgid ""
 "You can change your configuration as many times as you want: just use the\n"
 "same commands to choose another editor or update your email address."
 msgstr ""
-"You can change your configuration as many times as you want: just use the\n"
-"same commands to choose another editor or update your email address."
+"これらの設定はいつでも変えることができます。\n"
+"以前使ったコマンドを使えば、違うエディタやメールアドレスに変えることができます。"
 
 # blockquote, which can be cascaded
 #: git-novice/_episodes/02-setup.md:115 git-novice/_episodes/07-github.md:127
 msgid "> ## Proxy"
-msgstr "> ## Proxy"
+msgstr "> ## プロキシ"
 
 #: git-novice/_episodes/02-setup.md:116
 msgid ""
@@ -1452,18 +1433,17 @@ msgid ""
 "> {: .language-bash}"
 msgstr ""
 ">\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"
-"> may also need to tell Git about the proxy:\n"
+"> ネットワーク環境によっては\n"
+"> [プロキシ](https://en.wikipedia.org/wiki/Proxy_server) を使わなければならないかもしれません。\n"
+"> この場合、プロキシの設定が必要です：\n"
 ">\n"
 "> ~~~\n"
 "> $ git config --global http.proxy proxy-url\n"
 "> $ git config --global https.proxy proxy-url\n"
 "> ~~~\n"
 "> {: .language-bash}\n"
 ">\n"
-"> To disable the proxy, use\n"
+"> プロキシを無効にするには：\n"
 ">\n"
 "> ~~~\n"
 "> $ git config --global --unset http.proxy\n"
@@ -1474,7 +1454,7 @@ msgstr ""
 # blockquote, which can be cascaded
 #: git-novice/_episodes/02-setup.md:136
 msgid "> ## Git Help and Manual"
-msgstr "> ## Git Help and Manual"
+msgstr "> ## Git のヘルプとマニュアル"
 
 #: git-novice/_episodes/02-setup.md:137
 msgid ""
@@ -1490,9 +1470,7 @@ msgid ""
 "> {: .language-bash}"
 msgstr ""
 ">\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"
+"> `git` のコマンドを忘れた時は、`-h` を使えばコマンドの一覧を、`--help` を使えばマニュアルを見ることができます：\n"
 ">\n"
 "> ~~~\n"
 "> $ git config -h\n"