diff --git a/doc/upstream-training/source/locale/ja/LC_MESSAGES/upstream-training.po b/doc/upstream-training/source/locale/ja/LC_MESSAGES/upstream-training.po index 3a0bd34e..a82f5114 100644 --- a/doc/upstream-training/source/locale/ja/LC_MESSAGES/upstream-training.po +++ b/doc/upstream-training/source/locale/ja/LC_MESSAGES/upstream-training.po @@ -4,11 +4,11 @@ msgid "" msgstr "" "Project-Id-Version: Upstream Training Guide 2014.11.01\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-03-31 22:24+0000\n" +"POT-Creation-Date: 2016-04-19 14:32+0000\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"PO-Revision-Date: 2016-04-19 01:13+0000\n" +"PO-Revision-Date: 2016-04-19 02:47+0000\n" "Last-Translator: KATO Tomoyuki \n" "Language-Team: Japanese\n" "Language: ja\n" @@ -118,6 +118,9 @@ msgstr "要約" msgid "Accept the rules" msgstr "ルール遵守" +msgid "Account Setup" +msgstr "アカウントのセットアップ" + msgid "Acknowledge the language barrier" msgstr "言語障壁の認識" @@ -329,6 +332,9 @@ msgstr "" "簡単に修正できるバグ。初心者が OpenStack 開発において、ワークフローに慣れ、初" "めてコードに触れるために理想的なもの" +msgid "Build the presentation" +msgstr "プレゼンスライドのビルド" + msgid "Building karma" msgstr "カルマの構築" @@ -397,6 +403,9 @@ msgstr "" "新しいニックネームを用いて再接続するために、**disconnect** をクリックして " "**connect** をクリックします。" +msgid "Click the **I am a new Ubuntu One user**." +msgstr "**I am a new Ubuntu One user** をクリックします。" + msgid "Click the **edit** button and" msgstr "「edit」ボタンをクリックします。" @@ -928,26 +937,6 @@ msgid "" msgstr "" "Liberty 以降、統合プロジェクトはリリース管理チームにより管理されているもの" -msgid "" -"For Linux distributions like Debian, Ubuntu, or Mint open a terminal and " -"type::" -msgstr "" -"Debian、Ubuntu、Mint などの Linux ディストリビューションの場合、ターミナルを" -"開き、次のように入力します。" - -msgid "" -"For Linux distributions like Redhat, Fedora 21 or earlier, or Centos open a " -"terminal and type::" -msgstr "" -"Red Hat、Fedora 21 以前、CentOS 以前などの Linux ディストリビューションの場" -"合、ターミナルを開き、次のように入力します。" - -msgid "For Mac OS:" -msgstr "Mac OS の場合:" - -msgid "For Mac OS::" -msgstr "Mac OS の場合::" - msgid "" "For a linux distrubtions like Debian, Ubuntu, or Mint open a terminal and " "type::" @@ -970,9 +959,6 @@ msgstr "これまでの開催の詳細は :doc:`upstream-archives` を参照し msgid "For more information, see :doc:`upstream-details`." msgstr "詳細は :doc:`upstream-details` を参照してください。" -msgid "For openSUSE 12.2 and later open a terminal and type::" -msgstr "openSUSE 12.2 以降の場合、ターミナルを開き、次のように入力します。" - msgid "" "For the **Chat Server Port** type in **6697** and check the **SSL " "Connection** box." @@ -1049,6 +1035,12 @@ msgstr "よく知られたニックネームやアドレスの取得" msgid "Getting attention" msgstr "注目を集める" +msgid "Git" +msgstr "Git" + +msgid "Git Review" +msgstr "Git Review" + msgid "Go to http://colloquy.info and follow the download link." msgstr "http://colloquy.info をアクセスして、ダウンロードリンクに従います。" @@ -1059,6 +1051,13 @@ msgstr "" "Git `ダウンロードページ `_ をアクセスして、" "**Mac OS X** をクリックします。" +msgid "" +"Go to the `Launchpad login or create account page `_" +msgstr "" +"`Launchpad login or create account page `_ をア" +"クセスします。" + msgid "Good workflow" msgstr "良いワークフロー" @@ -1233,8 +1232,11 @@ msgstr "IRC プログラムのインストール" msgid "Install git review" msgstr "git review のインストール" -msgid "Installing git-review" -msgstr "git-review のインストール" +msgid "Install tox" +msgstr "tox のインストール" + +msgid "Install tox using pip::" +msgstr "pip を使用して tox をインストールします。::" msgid "Institutional members: Platinum and Gold sponsors" msgstr "組織メンバー：プラチナスポンサーおよびゴールドスポンサー" @@ -1949,12 +1951,12 @@ msgstr "" msgid "Set a target milestone" msgstr "目標マイルストーンの設定" -msgid "Setup For Mac OS & Linux" -msgstr "Mac OS & Linux 向けセットアップ" - msgid "Setup IRC" msgstr "IRC のセットアップ" +msgid "Setup Launchpad" +msgstr "Launchpad のセットアップ" + msgid "Setup and Learn GIT" msgstr "Git のセットアップと学習" @@ -1964,6 +1966,9 @@ msgstr "Shinobu KINJO (mentoring, assistant, japanese)" msgid "Sign In" msgstr "サインイン" +msgid "Sign Up" +msgstr "サインアップ" + msgid "Sign the Individual agreement" msgstr "個人アグリーメントの署名" @@ -1977,6 +1982,9 @@ msgstr "シンプルさ（行っていない作業量の最大化手法）が最 msgid "Sizing the task difficulty" msgstr "タスクの複雑さの見積" +msgid "Slides for Upstream Training" +msgstr "Upstream Training のスライド" + msgid "Small issue with an easy workaround. Any other insignificant bug" msgstr "簡単な回避方法のある軽微な問題。その他の重要ではないバグ" @@ -2406,9 +2414,6 @@ msgstr "" "にトレーニングを開催してきました。この「公式」イベントに加えて、いくつかの" "ユーザーグループは、ローカルなアップストリームトレーニングを開催しています。" -msgid "We'll first install git." -msgstr "最初に Git をインストールします。" - msgid "We'll install an IRC program called Colloquy." msgstr "Colloquy IRC プログラムをインストールします。" @@ -2441,6 +2446,9 @@ msgstr "マイルストーン公開日の前週" msgid "Welcome changing requirements, even late in development" msgstr "変更要求の歓迎、開発終了間近でも" +msgid "What is Launchpad?" +msgstr "Launchpad とは何か?" + msgid "What is OpenStack?" msgstr "OpenStack とは何か?" @@ -2603,6 +2611,9 @@ msgstr "`ブランチモデル <15-branching-model.html>`_" msgid "`Bugs `_" msgstr "`バグ `_" +msgid "`Code `_" +msgstr "`コード `_" + msgid "" "`Code Review `_ (`slides <16-reviewing.html>`__)" @@ -2932,6 +2943,9 @@ msgstr "" "`ユニットテストの実行 `_" +msgid "`Specifications `_" +msgstr "`スペック `_" + msgid "`Stable branch `_" msgstr "`安定ブランチ `_" @@ -2975,6 +2989,9 @@ msgid "" msgstr "" "`Training guides `_" +msgid "`Translations `_" +msgstr "`翻訳 `_" + msgid "" "`Understanding the DefCore Guidelines `_" @@ -2982,6 +2999,13 @@ msgstr "" "`DefCore ガイドラインの理解 `_" +msgid "" +"`Use cases for features `_" +msgstr "" +"`機能のユースケース `_" + msgid "" "``#action`` - Document an action item in the minutes. Include any nicknames " "in the line, and the item will be assigned to them. (nicknames are case-" @@ -3178,13 +3202,6 @@ msgstr "git config --global user.name \"Firstname Lastname\"" msgid "git review -s" msgstr "git review -s" -msgid "" -"git-review adds a subcommand to git that handles working with Gerrit, the " -"code review system used by OpenStack." -msgstr "" -"git-review は git にサブコマンドを追加します。OpenStack により使用されている" -"コードレビューシステム Gerrit を処理します。" - msgid "" "guiding principles\" used by the Foundation Board to determine how " "commercial implementations of OpenStack can be granted use of the trademark" diff --git a/doc/upstream-training/source/locale/ko_KR/LC_MESSAGES/upstream-training.po b/doc/upstream-training/source/locale/ko_KR/LC_MESSAGES/upstream-training.po index ea2284c0..8156c87c 100644 --- a/doc/upstream-training/source/locale/ko_KR/LC_MESSAGES/upstream-training.po +++ b/doc/upstream-training/source/locale/ko_KR/LC_MESSAGES/upstream-training.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: Upstream Training Guide 2014.11.01\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-03-31 22:24+0000\n" +"POT-Creation-Date: 2016-04-19 14:32+0000\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -949,26 +949,6 @@ msgid "" "Team" msgstr "Liberty에서 통합 프로젝트는 릴리즈 관리 팀에 의해 관리가 이루어집니다" -msgid "" -"For Linux distributions like Debian, Ubuntu, or Mint open a terminal and " -"type::" -msgstr "" -"Debian, Ubuntu, 또는 Mint와 같은 Linux 배포판의 경우 터미널을 열고 입력합니" -"다::" - -msgid "" -"For Linux distributions like Redhat, Fedora 21 or earlier, or Centos open a " -"terminal and type::" -msgstr "" -"Redhat, Fedora 21, 또는 Centos와 같은 Linux 배포판의 경우 터미널을 열고 입력" -"합니다::" - -msgid "For Mac OS:" -msgstr "Mac OS의 경우:" - -msgid "For Mac OS::" -msgstr "Mac OS의 경우::" - msgid "" "For a linux distrubtions like Debian, Ubuntu, or Mint open a terminal and " "type::" @@ -993,9 +973,6 @@ msgstr "" msgid "For more information, see :doc:`upstream-details`." msgstr "보다 자세한 정보는, :doc:`upstream-details` 를 살펴봅니다." -msgid "For openSUSE 12.2 and later open a terminal and type::" -msgstr "openSUSE 12.2 및 이후 버전의 경우 터미널을 열고 입력합니다::" - msgid "" "For the **Chat Server Port** type in **6697** and check the **SSL " "Connection** box." @@ -1319,9 +1296,6 @@ msgstr "IRC 프로그램 설치" msgid "Install git review" msgstr "git review 설치" -msgid "Installing git-review" -msgstr "git-review 설치하기" - msgid "Institutional members: Platinum and Gold sponsors" msgstr "기관 멤버 : 플래티늄과 골드 스폰서" @@ -2031,9 +2005,6 @@ msgstr "" msgid "Set a target milestone" msgstr "대상 마일스톤을 정하기" -msgid "Setup For Mac OS & Linux" -msgstr "Mac OS & Linux를 위한 셋업" - msgid "Setup IRC" msgstr "IRC 셋업" @@ -2493,9 +2464,6 @@ msgstr "" "개최하였습니다. \"공식\" 이벤트 뿐만 아니라, 몇몇 사용자 그룹은 로컬 " "Upstream training을 개최합니다." -msgid "We'll first install git." -msgstr "먼저 git를 설치할 것입니다." - msgid "We'll install an IRC program called Colloquy." msgstr "Colloquy 라는 IRC 프로그램을 설치할 것입니다." @@ -3261,13 +3229,6 @@ msgstr "git config --global user.name \"Firstname Lastname\"" msgid "git review -s" msgstr "git review -s" -msgid "" -"git-review adds a subcommand to git that handles working with Gerrit, the " -"code review system used by OpenStack." -msgstr "" -"git-review는 OpenStack에 의해 사용되는 코드 리뷰 시스템인 Gerrit과 함께 동작" -"하도록 다루는 git의 서브 명령어를 추가합니다." - msgid "" "guiding principles\" used by the Foundation Board to determine how " "commercial implementations of OpenStack can be granted use of the trademark" diff --git a/doc/upstream-training/source/locale/upstream-training.pot b/doc/upstream-training/source/locale/upstream-training.pot index a75faf62..abb4e355 100644 --- a/doc/upstream-training/source/locale/upstream-training.pot +++ b/doc/upstream-training/source/locale/upstream-training.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: Upstream Training Guide 2014.11.01\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-04-19 06:32+0000\n" +"POT-Creation-Date: 2016-04-20 06:06+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -16,6 +16,43 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +#: ../../README.rst:2 +msgid "Slides for Upstream Training" +msgstr "" + +#: ../../README.rst:4 +msgid "" +"The files are based on teaching material provided originally by Loic Dachary " +"as ODP files. Converted to RST text in order to be converted by Hieroglyph " +"in convenient HTML5 slides." +msgstr "" + +#: ../../README.rst:9 +msgid "Install tox" +msgstr "" + +#: ../../README.rst:11 +msgid "Install tox using pip::" +msgstr "" + +#: ../../README.rst:16 +msgid "Build the presentation" +msgstr "" + +#: ../../README.rst:18 +msgid "Build the presention using tox::" +msgstr "" + +#: ../../README.rst:22 +msgid "" +"You should be able to see the slides at the given location: ``training-" +"guides/doc/upstream-training/build/slides``." +msgstr "" + +#: ../../README.rst:25 +msgid "These are HTML5 slides and should open with any modern web browser." +msgstr "" + #: ../../accounts.rst:3 msgid "Account Setup" msgstr "" @@ -236,119 +273,125 @@ msgstr "" msgid "Git" msgstr "" -#: ../../git.rst:14 +#: ../../git.rst:15 msgid "" "Git is a free and open source distributed version control system that the " "OpenStack community uses to manage changes to source code." msgstr "" -#: ../../git.rst:18 ../../git.rst:73 +#: ../../git.rst:19 ../../git.rst:81 msgid "Installation" msgstr "" -#: ../../git.rst:21 ../../git.rst:76 +#: ../../git.rst:22 ../../git.rst:84 msgid "Mac OS" msgstr "" -#: ../../git.rst:23 +#: ../../git.rst:24 msgid "" "Go to the Git `download page `_ and click " "**Mac OS X**." msgstr "" -#: ../../git.rst:25 +#: ../../git.rst:27 msgid "" "The downloaded file should be a dmg in your downloads folder. Open that dmg " "file and follow the instructions on screen." msgstr "" -#: ../../git.rst:29 ../../git.rst:87 +#: ../../git.rst:30 +msgid "" +"If you use the package manager `Homebrew `_, open a terminal " +"and type::" +msgstr "" + +#: ../../git.rst:36 ../../git.rst:95 msgid "Linux" msgstr "" -#: ../../git.rst:31 ../../git.rst:89 +#: ../../git.rst:38 ../../git.rst:97 msgid "" "For distributions like Debian, Ubuntu, or Mint open a terminal and type::" msgstr "" -#: ../../git.rst:35 ../../git.rst:93 +#: ../../git.rst:42 ../../git.rst:101 msgid "" -"For distributions like Redhat, Fedora 21 or earlier, or Centos open a " +"For distributions like RedHat, Fedora 21 or earlier, or CentOS open a " "terminal and type::" msgstr "" -#: ../../git.rst:40 ../../git.rst:98 +#: ../../git.rst:47 ../../git.rst:106 msgid "For Fedora 22 or later open a terminal and type::" msgstr "" -#: ../../git.rst:44 ../../git.rst:102 -msgid "For openSUSE 12.2 and later open a terminal and type::" +#: ../../git.rst:51 ../../git.rst:110 +msgid "For SUSE distributions open a terminal and type::" msgstr "" -#: ../../git.rst:49 +#: ../../git.rst:56 msgid "Configure Git" msgstr "" -#: ../../git.rst:51 +#: ../../git.rst:58 msgid "" "Once you have Git installed you need to configure it. Open your terminal " "application and issue the following commands putting in your first/last name " "and email address. This is how your contributions will be identified::" msgstr "" -#: ../../git.rst:59 +#: ../../git.rst:66 msgid "Git Review" msgstr "" -#: ../../git.rst:63 +#: ../../git.rst:71 msgid "" "Git review is tool maintained by the OpenStack community. It adds an " "additional sub-command to git like so::" msgstr "" -#: ../../git.rst:68 +#: ../../git.rst:76 msgid "" "When you have changes in an OpenStack project repository, you can use this " "sub-command to have the changes posted to :doc:`gerrit` so that they can be " "reviewed." msgstr "" -#: ../../git.rst:78 +#: ../../git.rst:86 msgid "In a terminal type::" msgstr "" -#: ../../git.rst:82 +#: ../../git.rst:90 msgid "" "If you don't have pip installed already, follow the `installation " "documentation `_ for pip." msgstr "" -#: ../../git.rst:107 +#: ../../git.rst:115 msgid "Configuration" msgstr "" -#: ../../git.rst:109 +#: ../../git.rst:117 msgid "" "Git review assumes the user you're running it as is the same as your Gerrit " "username. If it's not, you can tell it by setting this git config setting::" msgstr "" -#: ../../git.rst:114 +#: ../../git.rst:122 msgid "" "If you don't know what your Gerrit username is, you can check the `Gerrit " "settings `_." msgstr "" -#: ../../git.rst:118 +#: ../../git.rst:126 msgid "Setup SSH Keys" msgstr "" -#: ../../git.rst:122 +#: ../../git.rst:129 msgid "What are they?" msgstr "" -#: ../../git.rst:123 +#: ../../git.rst:131 msgid "" "In order to push things to `Gerrit `_ we need " "to have a way to identify ourselves. We will do this using ssh keys which " @@ -357,21 +400,21 @@ msgid "" "response_authentication>`_ with the Gerrit server." msgstr "" -#: ../../git.rst:130 +#: ../../git.rst:138 msgid "SSH keys are always generated in pairs:" msgstr "" -#: ../../git.rst:132 +#: ../../git.rst:140 msgid "**Private key** - Only known to you and it should be safely guarded." msgstr "" -#: ../../git.rst:133 +#: ../../git.rst:141 msgid "" "**Public key** - Can be shared freely with any SSH server you wish to " "connect to." msgstr "" -#: ../../git.rst:136 +#: ../../git.rst:144 msgid "" "In summary, we will be generating these keys, and providing the Gerrit " "server with your public key. With your system holding the private key, it " @@ -379,100 +422,100 @@ msgid "" "authentication." msgstr "" -#: ../../git.rst:142 +#: ../../git.rst:150 msgid "Check For Existing Keys" msgstr "" -#: ../../git.rst:143 +#: ../../git.rst:152 msgid "Open your terminal program and type::" msgstr "" -#: ../../git.rst:147 +#: ../../git.rst:156 msgid "Typically public key filenames will look like:" msgstr "" -#: ../../git.rst:149 +#: ../../git.rst:158 msgid "id_dsa.pub" msgstr "" -#: ../../git.rst:150 +#: ../../git.rst:159 msgid "id_ecdsa.pub" msgstr "" -#: ../../git.rst:151 +#: ../../git.rst:160 msgid "id_ed25519.pub" msgstr "" -#: ../../git.rst:152 +#: ../../git.rst:161 msgid "id_rsa.pub" msgstr "" -#: ../../git.rst:154 +#: ../../git.rst:163 msgid "If you don't see .pub extension file, you need to generate keys." msgstr "" -#: ../../git.rst:158 +#: ../../git.rst:167 msgid "Generate SSH Keys" msgstr "" -#: ../../git.rst:159 +#: ../../git.rst:169 msgid "" "Assuming you weren't able to find keys in your ~/.ssh directory, you can " "generate keys by going into your terminal program and typing::" msgstr "" -#: ../../git.rst:164 +#: ../../git.rst:174 msgid "" "When you're prompted to \"Enter a file in which to save the key\" press " "Enter. This accepts the default location::" msgstr "" -#: ../../git.rst:169 +#: ../../git.rst:179 msgid "" "At the prompt, type a secure a passphase, you may enter one or press Enter " "to have no passphase::" msgstr "" -#: ../../git.rst:177 +#: ../../git.rst:187 msgid "Copy Public Key" msgstr "" -#: ../../git.rst:180 +#: ../../git.rst:190 msgid "Mac OS & Linux" msgstr "" -#: ../../git.rst:181 +#: ../../git.rst:192 msgid "From your terminal type::" msgstr "" -#: ../../git.rst:185 +#: ../../git.rst:196 msgid "Highlight and copy the output." msgstr "" -#: ../../git.rst:188 +#: ../../git.rst:199 msgid "Import Public Key Into Gerrit" msgstr "" -#: ../../git.rst:189 +#: ../../git.rst:201 msgid "" "Go to `Gerrit's SSH Public Keys settings `_." msgstr "" -#: ../../git.rst:191 +#: ../../git.rst:203 msgid "Click the 'Add Key' button." msgstr "" -#: ../../git.rst:192 +#: ../../git.rst:204 msgid "" "Paste the public key into the **Add SSH Public Key** text box and click Add." msgstr "" -#: ../../git.rst:195 +#: ../../git.rst:207 msgid "Learning Git" msgstr "" -#: ../../git.rst:197 +#: ../../git.rst:209 msgid "" "You can use `Git Immersion `_ to work " "through tutorials for learning git."