From 7869e444b100cd7c19357faf12e5af8db576ce03 Mon Sep 17 00:00:00 2001 From: HonkingGoose <34918129+HonkingGoose@users.noreply.github.com> Date: Wed, 20 Mar 2019 21:20:28 +0100 Subject: [PATCH 01/26] Change introduction. --- TRANSLATING.md | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/TRANSLATING.md b/TRANSLATING.md index bf7122ab9..d4ce6fdb8 100644 --- a/TRANSLATING.md +++ b/TRANSLATING.md @@ -1,8 +1,6 @@ # Translating Pro Git (2nd Edition) -The translation are managed in a decentralized way, with each translation teams maintaining their own project. Since each translation is a different repository, maintainers teams are self organized for each project. - -The Pro Git team simply pulls them in and builds them for the translation teams on the https://git-scm.com website. +The translations are managed in a decentralized way. Each translation team maintains their own project. Each translation is in its own repository, the Pro Git team simply pulls the changes and builds them into the https://git-scm.com website when ready. ## A Word About the Activity of Translating From 4726d3e97c1f93d88976499a565164b443defa8a Mon Sep 17 00:00:00 2001 From: HonkingGoose <34918129+HonkingGoose@users.noreply.github.com> Date: Wed, 20 Mar 2019 21:20:51 +0100 Subject: [PATCH 02/26] Change heading text. --- TRANSLATING.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/TRANSLATING.md b/TRANSLATING.md index d4ce6fdb8..1a5ce06b2 100644 --- a/TRANSLATING.md +++ b/TRANSLATING.md @@ -2,7 +2,7 @@ The translations are managed in a decentralized way. Each translation team maintains their own project. Each translation is in its own repository, the Pro Git team simply pulls the changes and builds them into the https://git-scm.com website when ready. -## A Word About the Activity of Translating +## General guidance for translating Pro Git Pro Git is a book about a technical tool. As such it combines a double difficulty for translators: From 869446541fbcf193f9b8dd1f26024907648bf303 Mon Sep 17 00:00:00 2001 From: HonkingGoose <34918129+HonkingGoose@users.noreply.github.com> Date: Wed, 20 Mar 2019 21:21:50 +0100 Subject: [PATCH 03/26] Rewrite general guidance. --- TRANSLATING.md | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/TRANSLATING.md b/TRANSLATING.md index 1a5ce06b2..26a9e468c 100644 --- a/TRANSLATING.md +++ b/TRANSLATING.md @@ -4,16 +4,13 @@ The translations are managed in a decentralized way. Each translation team maint ## General guidance for translating Pro Git -Pro Git is a book about a technical tool. As such it combines a double difficulty for translators: +Pro Git is a book about a technical tool, therefore translating it is difficult compared to a non-technical translation. - * The translation of a book, even in parts requires that the translators be aware of the whole content of book. This usually requires for each translator to have read the book and to agree with some common style of output. These rules ensure that the reader won't feel transitions in the text when switching from a part produced by one translator to a part from another one. - * Git is a computer tool. Pro Git tries to make it affordable to not so technical-savvy people and it's really good that the translators do not work on the core of git, because it's a user's perspective that is needed for the most part of the book. That also means that the translation may be deceiving if the translator has never used Git. Good translators must be Git users to actually keep Pro Git understandable. - -Moreover, the book was written in a formatting language called [Asciidoc](https://asciidoctor.org). Some parts of the files making up the book are in fact Asciidoc commands. Upsetting these commands will make it impossible to assemble and to compile the files into the PDF, epub and html output. - -Be sure to have read and understood the basics of [how Asciidoc formatting works](https://asciidoctor.org/docs/asciidoc-syntax-quick-reference/) before starting to change any file. - -Translating Pro Git is such an endeavor that if you don't want to lose your energy on poor results, stress and deceived expectations, you have to set up, enforce and abide by rules stemming from these basic advices. +The following are guidelines to help you on your way: +* Before you begin, read the whole Git Pro book in English, so that you're aware of the content, and are familiar with the style used. +* Ensure you have a good working knowledge of git, so that explaining the technical terms is doable. +* Stick to a common style and format for the translation. +* Be sure to read and understand the basics of [Asciidoc formatting](https://asciidoctor.org/docs/asciidoc-syntax-quick-reference/). Not following the asciidoc syntax can lead to problems with building/compilation of the pdf, epub and html files needed for the book. ## Translating the Book to Another Language From 4de87358b6172c238801aaa123e8d181d56cb509 Mon Sep 17 00:00:00 2001 From: HonkingGoose <34918129+HonkingGoose@users.noreply.github.com> Date: Wed, 20 Mar 2019 21:22:54 +0100 Subject: [PATCH 04/26] Adjust capitalization. --- TRANSLATING.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/TRANSLATING.md b/TRANSLATING.md index 26a9e468c..1c5d3c9bf 100644 --- a/TRANSLATING.md +++ b/TRANSLATING.md @@ -12,7 +12,7 @@ The following are guidelines to help you on your way: * Stick to a common style and format for the translation. * Be sure to read and understand the basics of [Asciidoc formatting](https://asciidoctor.org/docs/asciidoc-syntax-quick-reference/). Not following the asciidoc syntax can lead to problems with building/compilation of the pdf, epub and html files needed for the book. -## Translating the Book to Another Language +## Translating the book to another language ### Existing Projects From 0f09b5cf8a75e11567d14c13364d9944cd3a1b32 Mon Sep 17 00:00:00 2001 From: HonkingGoose <34918129+HonkingGoose@users.noreply.github.com> Date: Wed, 20 Mar 2019 21:23:44 +0100 Subject: [PATCH 05/26] Rewrite header. --- TRANSLATING.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/TRANSLATING.md b/TRANSLATING.md index 1c5d3c9bf..960b23f31 100644 --- a/TRANSLATING.md +++ b/TRANSLATING.md @@ -14,7 +14,7 @@ The following are guidelines to help you on your way: ## Translating the book to another language -### Existing Projects +### Helping with a existing project If you wish to help with translating Pro Git 2nd edition to your language, first check for an already existing project in the following list and get in touch with the people in charge of it if there's already one. Go to the project page, open an issue, present yourself and ask what can be done. From 8ee8874dd66871436543fc309fe2cb2cdd91b3bb Mon Sep 17 00:00:00 2001 From: HonkingGoose <34918129+HonkingGoose@users.noreply.github.com> Date: Wed, 20 Mar 2019 21:25:20 +0100 Subject: [PATCH 06/26] Rewrite text, short, bullet-points. --- TRANSLATING.md | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/TRANSLATING.md b/TRANSLATING.md index 960b23f31..8f80d3e76 100644 --- a/TRANSLATING.md +++ b/TRANSLATING.md @@ -15,10 +15,9 @@ The following are guidelines to help you on your way: ## Translating the book to another language ### Helping with a existing project - -If you wish to help with translating Pro Git 2nd edition to your language, first check for an already existing project in the following list and get in touch with the people in charge of it if there's already one. Go to the project page, open an issue, present yourself and ask what can be done. - -Existing projects include: +* Check for an already existing project in the following table. +* Go to the project's page on GitHub. +* Open an issue, introduce yourself and ask where you can help. Language | Project ------------ | ------------- From 5776e2fdf83d5f0f37d10e95b751299c108e6b25 Mon Sep 17 00:00:00 2001 From: HonkingGoose <34918129+HonkingGoose@users.noreply.github.com> Date: Wed, 20 Mar 2019 21:28:18 +0100 Subject: [PATCH 07/26] Improve header text. --- TRANSLATING.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/TRANSLATING.md b/TRANSLATING.md index 8f80d3e76..6844dcd79 100644 --- a/TRANSLATING.md +++ b/TRANSLATING.md @@ -47,7 +47,7 @@ Türkçe | [progit/progit2-tr](https://github.com/progit/progit2-tr) 简体中文 | [progit/progit2-zh](https://github.com/progit/progit2-zh) 正體中文 | [progit/progit2-zh-tw](https://github.com/progit/progit2-zh-tw) -### Your Language is not Listed +### Starting a new translation Then you're lucky! You're gonna be the initiator of a new translation project! From 8cde01f8b3fc976665c48d2d5fe3e5668eb1525d Mon Sep 17 00:00:00 2001 From: HonkingGoose <34918129+HonkingGoose@users.noreply.github.com> Date: Wed, 20 Mar 2019 21:31:18 +0100 Subject: [PATCH 08/26] Rewrite, shorten text. --- TRANSLATING.md | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/TRANSLATING.md b/TRANSLATING.md index 6844dcd79..a26665e26 100644 --- a/TRANSLATING.md +++ b/TRANSLATING.md @@ -49,17 +49,13 @@ Türkçe | [progit/progit2-tr](https://github.com/progit/progit2-tr) ### Starting a new translation -Then you're lucky! You're gonna be the initiator of a new translation project! +If there is no project for your language, you can start your own translation. -You can start to make your own version with the second edition in English, available here. To do so, - - 1. Pick your the [ISO 639 code](https://en.wikipedia.org/wiki/List_of_ISO_639-1_codes) and [create a GitHub organization](https://help.github.com/articles/creating-a-new-organization-from-scratch/), say `progit2-[your code]` on github - 2. Create a project progit2 - 3. Copy the structure of progit/progit2 (this project) in your project and start translating. You can reuse some material from the first edition, but beware that: - 1. the text has been reworked in numerous parts - 2. the markup has changed from markdown to [asciidoc](http://asciidoc.org) - 4. Push to the new repo a few translated chapters - 5. Ping an organizer so that the second edition of Progit in your language is pushed on git-scm.com. +Base your work on the second edition in English, available [here](https://github.com/progit/progit2). To do so: + 1. Pick the correct [ISO 639 code](https://en.wikipedia.org/wiki/List_of_ISO_639-1_codes) for your language. + 1. Create a [GitHub organization](https://help.github.com/articles/creating-a-new-organization-from-scratch/), for example: `progit2-[your code]` on GitHub. + 1. Create a project ``progit2``. + 1. Copy the structure of progit/progit2 (this project) in your project and start translating. ### Updating the Status of Your Translation From 8e380bbe648e95c673a51e5005eb5542d8057fdc Mon Sep 17 00:00:00 2001 From: HonkingGoose <34918129+HonkingGoose@users.noreply.github.com> Date: Wed, 20 Mar 2019 21:32:04 +0100 Subject: [PATCH 09/26] Fix capitalization. --- TRANSLATING.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/TRANSLATING.md b/TRANSLATING.md index a26665e26..c577a8f82 100644 --- a/TRANSLATING.md +++ b/TRANSLATING.md @@ -57,7 +57,7 @@ Base your work on the second edition in English, available [here](https://github 1. Create a project ``progit2``. 1. Copy the structure of progit/progit2 (this project) in your project and start translating. -### Updating the Status of Your Translation +### Updating the status of your translation On https://git-scm.com, the translations are listed in three categories: From a934831c6aa71f45c6016d91b265d2b8b8cf9ef1 Mon Sep 17 00:00:00 2001 From: HonkingGoose <34918129+HonkingGoose@users.noreply.github.com> Date: Wed, 20 Mar 2019 21:32:57 +0100 Subject: [PATCH 10/26] Rewrite text, add markdown table. --- TRANSLATING.md | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/TRANSLATING.md b/TRANSLATING.md index c577a8f82..f68b1c970 100644 --- a/TRANSLATING.md +++ b/TRANSLATING.md @@ -59,13 +59,13 @@ Base your work on the second edition in English, available [here](https://github ### Updating the status of your translation -On https://git-scm.com, the translations are listed in three categories: +On https://git-scm.com, the translations are divided into three categories. Once you have reached one of these levels, contact the maintainers of https://git-scm.com/ so that they can pull the changes. - 1. Translation just started. The introduction is translated at least, but there's not much to read. It's time to translate the meat of the book. - 2. Partially translated. The chapters up to chapter 6 have been translated. The book is becoming useful to help the reader become a fluent Git user. - 3. Fully Translated. The book is almost fully translated. - - Once you have reached one of these levels, just contact the maintainers of the git-scm site to make your translation appear in the right category. +| Category | Completion | +| :------------- | :------------- | +| Translation started for | Introduction translated, not much else. | +| Partial translations available in | up to chapter 6 has been translated. | +| Full translation available in |the book is (almost) fully translated. | ## Using Travis-CI for Continuous Integration From b4469cd60b0cac314470570d02b123a018888684 Mon Sep 17 00:00:00 2001 From: HonkingGoose <34918129+HonkingGoose@users.noreply.github.com> Date: Wed, 20 Mar 2019 21:33:43 +0100 Subject: [PATCH 11/26] Fix grammar and capitalization. --- TRANSLATING.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/TRANSLATING.md b/TRANSLATING.md index f68b1c970..17cf75ee6 100644 --- a/TRANSLATING.md +++ b/TRANSLATING.md @@ -67,7 +67,7 @@ On https://git-scm.com, the translations are divided into three categories. Once | Partial translations available in | up to chapter 6 has been translated. | | Full translation available in |the book is (almost) fully translated. | -## Using Travis-CI for Continuous Integration +## Continuous integration with Travis CI Travis-CI is a [continuous integration](https://en.wikipedia.org/wiki/Continuous_integration) service that fits nicely with GitHub. It can be used to automatically check that the pull-requests from the collaborators don't break the Asciidoc markup but can also provide compiled versions of the books. From 76e624c3dcaecb9a149e606e6fb621fe5a2a7d7f Mon Sep 17 00:00:00 2001 From: HonkingGoose <34918129+HonkingGoose@users.noreply.github.com> Date: Wed, 20 Mar 2019 21:35:20 +0100 Subject: [PATCH 12/26] Rewrite text, add markdown formatting. --- TRANSLATING.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/TRANSLATING.md b/TRANSLATING.md index 17cf75ee6..408b0d671 100644 --- a/TRANSLATING.md +++ b/TRANSLATING.md @@ -69,7 +69,7 @@ On https://git-scm.com, the translations are divided into three categories. Once ## Continuous integration with Travis CI -Travis-CI is a [continuous integration](https://en.wikipedia.org/wiki/Continuous_integration) service that fits nicely with GitHub. It can be used to automatically check that the pull-requests from the collaborators don't break the Asciidoc markup but can also provide compiled versions of the books. +*Travis CI* is a [continuous integration](https://en.wikipedia.org/wiki/Continuous_integration) service that integrates with GitHub. *Travis CI* is used to ensure that a pull-request doesn't break the build or compilation. *Travis CI* can also provide compiled versions of the book. Setting up Travis-CI requires to have administrative privileges over the repository. If you're not an administrator of the repository, let them know that they can enhance the visibility of the project by doing the following steps. From 266f038d8c5bc8a3749a9a7fcdc8fba08f6bff21 Mon Sep 17 00:00:00 2001 From: HonkingGoose <34918129+HonkingGoose@users.noreply.github.com> Date: Wed, 20 Mar 2019 21:36:20 +0100 Subject: [PATCH 13/26] Shorten text, add markdown formatting. --- TRANSLATING.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/TRANSLATING.md b/TRANSLATING.md index 408b0d671..0861d3fe0 100644 --- a/TRANSLATING.md +++ b/TRANSLATING.md @@ -71,7 +71,7 @@ On https://git-scm.com, the translations are divided into three categories. Once *Travis CI* is a [continuous integration](https://en.wikipedia.org/wiki/Continuous_integration) service that integrates with GitHub. *Travis CI* is used to ensure that a pull-request doesn't break the build or compilation. *Travis CI* can also provide compiled versions of the book. -Setting up Travis-CI requires to have administrative privileges over the repository. If you're not an administrator of the repository, let them know that they can enhance the visibility of the project by doing the following steps. +Setting up *Travis CI* requires administrative control over the repository. ### Checking the Validity of the Text From a65db64e89f5803e391ea1cd4b89caeb1f78abb1 Mon Sep 17 00:00:00 2001 From: HonkingGoose <34918129+HonkingGoose@users.noreply.github.com> Date: Wed, 20 Mar 2019 21:37:49 +0100 Subject: [PATCH 14/26] Remove unnecessary text. --- TRANSLATING.md | 4 ---- 1 file changed, 4 deletions(-) diff --git a/TRANSLATING.md b/TRANSLATING.md index 0861d3fe0..9889e7c48 100644 --- a/TRANSLATING.md +++ b/TRANSLATING.md @@ -73,10 +73,6 @@ On https://git-scm.com, the translations are divided into three categories. Once Setting up *Travis CI* requires administrative control over the repository. -### Checking the Validity of the Text - -This is the most useful set up for contributors. It allows to check at any moment that the book compiles properly and provides the same checks for pull-requests. - #### Registering for CI If you don't already have an account at travis-ci.org, then go to [their page](https://travis-ci.org/) and log in. Otherwise you can register with your GitHub account. From 87c64e1298eba542deffcd3fa3793c6e701e4f05 Mon Sep 17 00:00:00 2001 From: HonkingGoose <34918129+HonkingGoose@users.noreply.github.com> Date: Wed, 20 Mar 2019 21:38:45 +0100 Subject: [PATCH 15/26] Change header level, fix text. --- TRANSLATING.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/TRANSLATING.md b/TRANSLATING.md index 9889e7c48..fd48e6f8d 100644 --- a/TRANSLATING.md +++ b/TRANSLATING.md @@ -73,7 +73,7 @@ On https://git-scm.com, the translations are divided into three categories. Once Setting up *Travis CI* requires administrative control over the repository. -#### Registering for CI +### Registering for Travis continuous integration If you don't already have an account at travis-ci.org, then go to [their page](https://travis-ci.org/) and log in. Otherwise you can register with your GitHub account. From fc20e13a83d42732e42829aa4c7e98fd96135416 Mon Sep 17 00:00:00 2001 From: HonkingGoose <34918129+HonkingGoose@users.noreply.github.com> Date: Wed, 20 Mar 2019 21:40:38 +0100 Subject: [PATCH 16/26] Rewrite text. Add link to official docs. --- TRANSLATING.md | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/TRANSLATING.md b/TRANSLATING.md index fd48e6f8d..25226c782 100644 --- a/TRANSLATING.md +++ b/TRANSLATING.md @@ -75,11 +75,9 @@ Setting up *Travis CI* requires administrative control over the repository. ### Registering for Travis continuous integration -If you don't already have an account at travis-ci.org, then go to [their page](https://travis-ci.org/) and log in. Otherwise you can register with your GitHub account. - -Register your project in Travis. If a build is not fired automatically, it can be forced. The logs of build provide useful data when the build fails. - -Please refer to the documentation on Travis-ci.org for further information on using their system. +1. Register a Travis account [here](https://travis-ci.org/). +1. Register your project in Travis. +Please refer to the [Travis documentation](https://docs.travis-ci.com/) for more information. #### Setting up Your Repo for CI From 06807776fe186355480a8677340ca27fb3b886e8 Mon Sep 17 00:00:00 2001 From: HonkingGoose <34918129+HonkingGoose@users.noreply.github.com> Date: Wed, 20 Mar 2019 21:41:54 +0100 Subject: [PATCH 17/26] Decrease header level. Improve header text. --- TRANSLATING.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/TRANSLATING.md b/TRANSLATING.md index 25226c782..90f259cd3 100644 --- a/TRANSLATING.md +++ b/TRANSLATING.md @@ -79,7 +79,7 @@ Setting up *Travis CI* requires administrative control over the repository. 1. Register your project in Travis. Please refer to the [Travis documentation](https://docs.travis-ci.com/) for more information. -#### Setting up Your Repo for CI +### Setting up your repository for continuous integration Travis-CI works by scanning your project's root directory for a file named `.travis.yml` and following the recipe that it contains. The good news is that you don't really need to understand how all of this works. There's a project already set up to simplify the setup. Download the file [here](https://raw.githubusercontent.com/progit/progit2-pub/master/travis.yml) and save it as `.travis.yml` in your working copy. Commit it and push it; that should fire up a compilation and a check of the book's contents. From b75e4b0c716f91f303ab59dfa9f59df4ee91e459 Mon Sep 17 00:00:00 2001 From: HonkingGoose <34918129+HonkingGoose@users.noreply.github.com> Date: Wed, 20 Mar 2019 21:42:43 +0100 Subject: [PATCH 18/26] Rewrite text, add markdown formatting. --- TRANSLATING.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/TRANSLATING.md b/TRANSLATING.md index 90f259cd3..1618193e5 100644 --- a/TRANSLATING.md +++ b/TRANSLATING.md @@ -81,8 +81,8 @@ Please refer to the [Travis documentation](https://docs.travis-ci.com/) for more ### Setting up your repository for continuous integration -Travis-CI works by scanning your project's root directory for a file named `.travis.yml` and following the recipe that it contains. The good news is that you don't really need to understand how all of this works. There's a project already set up to simplify the setup. Download the file [here](https://raw.githubusercontent.com/progit/progit2-pub/master/travis.yml) and save it as `.travis.yml` in your working copy. Commit it and push it; that should fire up a compilation and a check of the book's contents. - +*Travis CI* works by scanning your project's root directory for a file named `.travis.yml` and following the 'recipe' that it contains. The good news is: there's already a working `.travis.yml` file in the Pro Git 2 source [here](https://raw.githubusercontent.com/progit/progit2-pub/master/travis.yml). +Copy that file, and put it in your working directory. Commit the .yml file and push it to your translation repository; that should fire up a compilation and a check of the book's contents. ### Setting Up a Publication Chain for Ebooks From bc402a0548cdf270639bf8ff664fbbc2d6d5a842 Mon Sep 17 00:00:00 2001 From: HonkingGoose <34918129+HonkingGoose@users.noreply.github.com> Date: Wed, 20 Mar 2019 21:43:37 +0100 Subject: [PATCH 19/26] Decrease header level, fix capitalization. --- TRANSLATING.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/TRANSLATING.md b/TRANSLATING.md index 1618193e5..0f89fb20a 100644 --- a/TRANSLATING.md +++ b/TRANSLATING.md @@ -84,7 +84,7 @@ Please refer to the [Travis documentation](https://docs.travis-ci.com/) for more *Travis CI* works by scanning your project's root directory for a file named `.travis.yml` and following the 'recipe' that it contains. The good news is: there's already a working `.travis.yml` file in the Pro Git 2 source [here](https://raw.githubusercontent.com/progit/progit2-pub/master/travis.yml). Copy that file, and put it in your working directory. Commit the .yml file and push it to your translation repository; that should fire up a compilation and a check of the book's contents. -### Setting Up a Publication Chain for Ebooks +## Setting up a publication chain for e-books This is a quite technical task. Please ping @jnavila for this. From 039fe2a934ae19b7d0c45599fc8662c588de9b61 Mon Sep 17 00:00:00 2001 From: HonkingGoose <34918129+HonkingGoose@users.noreply.github.com> Date: Wed, 20 Mar 2019 21:44:33 +0100 Subject: [PATCH 20/26] Cleanup text. --- TRANSLATING.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/TRANSLATING.md b/TRANSLATING.md index 0f89fb20a..94c264af3 100644 --- a/TRANSLATING.md +++ b/TRANSLATING.md @@ -86,7 +86,7 @@ Copy that file, and put it in your working directory. Commit the .yml file and p ## Setting up a publication chain for e-books -This is a quite technical task. Please ping @jnavila for this. +This is a technical task, please ping @jnavila to get started with epub publication. ## Beyond Pro Git From 32800fa941d9b72a21798a95bcc65d02531dfe40 Mon Sep 17 00:00:00 2001 From: HonkingGoose <34918129+HonkingGoose@users.noreply.github.com> Date: Wed, 20 Mar 2019 21:45:44 +0100 Subject: [PATCH 21/26] Remove "Beyond Pro Git" --- TRANSLATING.md | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/TRANSLATING.md b/TRANSLATING.md index 94c264af3..48a9deb2a 100644 --- a/TRANSLATING.md +++ b/TRANSLATING.md @@ -87,15 +87,3 @@ Copy that file, and put it in your working directory. Commit the .yml file and p ## Setting up a publication chain for e-books This is a technical task, please ping @jnavila to get started with epub publication. - -## Beyond Pro Git - -Translating the book is the first step. Once this is finished, you could consider translating the user interface of Git itself. - -This task requires a more technical knowledge of the tool than the book. Hopefully, after having translated the full book content, you can understand the terms used in the application. If you feel technically up to the task, the repo is [here](https://github.com/git-l10n/git-po) and you just have to follow the [guide](https://github.com/git-l10n/git-po/blob/master/po/README). - -Beware though that - - * you'll need to use more specific tools to manage localization po files (such as editing them with [poedit](https://poedit.net/) and merging them. You might need to compile git in order to check your work. - * a basic knowledge of how translating applications works is required, which is significantly different from translating books. - * the core Git project uses more stringent [procedures](https://github.com/git-l10n/git-po/blob/master/Documentation/SubmittingPatches) to accept contributions, be sure to abide by them. From 24364619d7af5c7fd0fd14132e1cc481b3ba32e9 Mon Sep 17 00:00:00 2001 From: HonkingGoose <34918129+HonkingGoose@users.noreply.github.com> Date: Wed, 20 Mar 2019 21:53:20 +0100 Subject: [PATCH 22/26] Add newline. --- TRANSLATING.md | 1 + 1 file changed, 1 insertion(+) diff --git a/TRANSLATING.md b/TRANSLATING.md index 48a9deb2a..3918f57a6 100644 --- a/TRANSLATING.md +++ b/TRANSLATING.md @@ -15,6 +15,7 @@ The following are guidelines to help you on your way: ## Translating the book to another language ### Helping with a existing project + * Check for an already existing project in the following table. * Go to the project's page on GitHub. * Open an issue, introduce yourself and ask where you can help. From 9f5d79c4dd5ca20a4bf3468dd9eb29658c434942 Mon Sep 17 00:00:00 2001 From: HonkingGoose <34918129+HonkingGoose@users.noreply.github.com> Date: Wed, 20 Mar 2019 21:54:04 +0100 Subject: [PATCH 23/26] Fix table rendering. --- TRANSLATING.md | 1 + 1 file changed, 1 insertion(+) diff --git a/TRANSLATING.md b/TRANSLATING.md index 3918f57a6..c7e0c2b3e 100644 --- a/TRANSLATING.md +++ b/TRANSLATING.md @@ -20,6 +20,7 @@ The following are guidelines to help you on your way: * Go to the project's page on GitHub. * Open an issue, introduce yourself and ask where you can help. + Language | Project ------------ | ------------- Беларуская | [progit/progit2-be](https://github.com/progit/progit2-be) From a0ec59d053f39664a15bfe0219701d60c9f24537 Mon Sep 17 00:00:00 2001 From: HonkingGoose <34918129+HonkingGoose@users.noreply.github.com> Date: Wed, 20 Mar 2019 21:56:28 +0100 Subject: [PATCH 24/26] Use proper github flavoured markdown for table. --- TRANSLATING.md | 55 +++++++++++++++++++++++++------------------------- 1 file changed, 27 insertions(+), 28 deletions(-) diff --git a/TRANSLATING.md b/TRANSLATING.md index c7e0c2b3e..092c7cd97 100644 --- a/TRANSLATING.md +++ b/TRANSLATING.md @@ -20,34 +20,33 @@ The following are guidelines to help you on your way: * Go to the project's page on GitHub. * Open an issue, introduce yourself and ask where you can help. - - Language | Project ------------- | ------------- -Беларуская | [progit/progit2-be](https://github.com/progit/progit2-be) -Čeština | [progit-cs/progit2-cs](https://github.com/progit-cs/progit2-cs) -English | [progit/progit2](https://github.com/progit/progit2) -Español | [progit/progit2-es](https://github.com/progit/progit2-es) -Français | [progit/progit2-fr](https://github.com/progit/progit2-fr) -Deutsch | [progit-de/progit2](https://github.com/progit-de/progit2) -Ελληνικά | [progit2-gr/progit2](https://github.com/progit2-gr/progit2) -Indonesian | [progit/progit2-id](https://github.com/progit/progit2-id) -Italiano | [progit/progit2-it](https://github.com/progit/progit2-it) -日本語 | [progit/progit2-ja](https://github.com/progit/progit2-ja) -한국어 | [progit/progit2-ko](https://github.com/progit/progit2-ko) -Македонски | [progit2-mk/progit2](https://github.com/progit2-mk/progit2) -Bahasa Melayu| [progit2-ms/progit2](https://github.com/progit2-ms/progit2) -Nederlands | [progit/progit2-nl](https://github.com/progit/progit2-nl) -Polski | [progit2-pl/progit2-pl](https://github.com/progit2-pl/progit2-pl) -Português (Brasil) | [progit2-pt-br/progit2](https://github.com/progit2-pt-br/progit2) -Русский | [progit/progit2-ru](https://github.com/progit/progit2-ru) -Slovenščina | [progit/progit2-sl](https://github.com/progit/progit2-sl) -Српски | [progit/progit2-sr](https://github.com/progit/progit2-sr) -Tagalog | [progit2-tl/progit2](https://github.com/progit2-tl/progit2) -Türkçe | [progit/progit2-tr](https://github.com/progit/progit2-tr) -Українська| [progit/progit2-uk](https://github.com/progit/progit2-uk) -Ўзбекча | [progit/progit2-uz](https://github.com/progit/progit2-uz) -简体中文 | [progit/progit2-zh](https://github.com/progit/progit2-zh) -正體中文 | [progit/progit2-zh-tw](https://github.com/progit/progit2-zh-tw) +| Language | GitHub page | +| :------------- | :------------- | +| Беларуская | [progit/progit2-be](https://github.com/progit/progit2-be) | +| Čeština | [progit-cs/progit2-cs](https://github.com/progit-cs/progit2-cs) | +| English | [progit/progit2](https://github.com/progit/progit2) | +| Español | [progit/progit2-es](https://github.com/progit/progit2-es) | +| Français | [progit/progit2-fr](https://github.com/progit/progit2-fr) | +| Deutsch | [progit-de/progit2](https://github.com/progit-de/progit2) | +| Ελληνικά | [progit2-gr/progit2](https://github.com/progit2-gr/progit2) | +| Indonesian | [progit/progit2-id](https://github.com/progit/progit2-id) | +| Italiano | [progit/progit2-it](https://github.com/progit/progit2-it) | +| 日本語 | [progit/progit2-ja](https://github.com/progit/progit2-ja) | +| 한국어 | [progit/progit2-ko](https://github.com/progit/progit2-ko) | +| Македонски | [progit2-mk/progit2](https://github.com/progit2-mk/progit2) | +| Bahasa Melayu| [progit2-ms/progit2](https://github.com/progit2-ms/progit2) | +| Nederlands | [progit/progit2-nl](https://github.com/progit/progit2-nl) | +| Polski | [progit2-pl/progit2-pl](https://github.com/progit2-pl/progit2-pl) | +| Português (Brasil) | [progit2-pt-br/progit2](https://github.com/progit2-pt-br/progit2) | +| Русский | [progit/progit2-ru](https://github.com/progit/progit2-ru) | +| Slovenščina | [progit/progit2-sl](https://github.com/progit/progit2-sl) | +| Српски | [progit/progit2-sr](https://github.com/progit/progit2-sr) | +| Tagalog | [progit2-tl/progit2](https://github.com/progit2-tl/progit2) | +| Türkçe | [progit/progit2-tr](https://github.com/progit/progit2-tr) | +| Українська| [progit/progit2-uk](https://github.com/progit/progit2-uk) | +| Ўзбекча | [progit/progit2-uz](https://github.com/progit/progit2-uz) | +| 简体中文 | [progit/progit2-zh](https://github.com/progit/progit2-zh) | +| 正體中文 | [progit/progit2-zh-tw](https://github.com/progit/progit2-zh-tw) | ### Starting a new translation From 2e8e33c10bb920cc5092b3204b3d99732d782914 Mon Sep 17 00:00:00 2001 From: HonkingGoose <34918129+HonkingGoose@users.noreply.github.com> Date: Wed, 20 Mar 2019 21:58:23 +0100 Subject: [PATCH 25/26] Remove markdown formatting. --- TRANSLATING.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/TRANSLATING.md b/TRANSLATING.md index 092c7cd97..b1d50df4b 100644 --- a/TRANSLATING.md +++ b/TRANSLATING.md @@ -70,9 +70,9 @@ On https://git-scm.com, the translations are divided into three categories. Once ## Continuous integration with Travis CI -*Travis CI* is a [continuous integration](https://en.wikipedia.org/wiki/Continuous_integration) service that integrates with GitHub. *Travis CI* is used to ensure that a pull-request doesn't break the build or compilation. *Travis CI* can also provide compiled versions of the book. +Travis CI is a [continuous integration](https://en.wikipedia.org/wiki/Continuous_integration) service that integrates with GitHub. Travis CI is used to ensure that a pull-request doesn't break the build or compilation. Travis CI can also provide compiled versions of the book. -Setting up *Travis CI* requires administrative control over the repository. +Setting up Travis CI requires administrative control over the repository. ### Registering for Travis continuous integration @@ -82,7 +82,7 @@ Please refer to the [Travis documentation](https://docs.travis-ci.com/) for more ### Setting up your repository for continuous integration -*Travis CI* works by scanning your project's root directory for a file named `.travis.yml` and following the 'recipe' that it contains. The good news is: there's already a working `.travis.yml` file in the Pro Git 2 source [here](https://raw.githubusercontent.com/progit/progit2-pub/master/travis.yml). +Travis CI works by scanning your project's root directory for a file named `.travis.yml` and following the 'recipe' that it contains. The good news is: there's already a working `.travis.yml` file in the Pro Git 2 source [here](https://raw.githubusercontent.com/progit/progit2-pub/master/travis.yml). Copy that file, and put it in your working directory. Commit the .yml file and push it to your translation repository; that should fire up a compilation and a check of the book's contents. ## Setting up a publication chain for e-books From b720985e610759b93f4676eced10fe1ffefa184d Mon Sep 17 00:00:00 2001 From: HonkingGoose <34918129+HonkingGoose@users.noreply.github.com> Date: Wed, 20 Mar 2019 22:00:05 +0100 Subject: [PATCH 26/26] Fix text. --- TRANSLATING.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/TRANSLATING.md b/TRANSLATING.md index b1d50df4b..eaf1d2e15 100644 --- a/TRANSLATING.md +++ b/TRANSLATING.md @@ -52,7 +52,7 @@ The following are guidelines to help you on your way: If there is no project for your language, you can start your own translation. -Base your work on the second edition in English, available [here](https://github.com/progit/progit2). To do so: +Base your work on the second edition of the book, available [here](https://github.com/progit/progit2). To do so: 1. Pick the correct [ISO 639 code](https://en.wikipedia.org/wiki/List_of_ISO_639-1_codes) for your language. 1. Create a [GitHub organization](https://help.github.com/articles/creating-a-new-organization-from-scratch/), for example: `progit2-[your code]` on GitHub. 1. Create a project ``progit2``.