minor

Author: iliakan

README.md

@@ -1,3 +1,4 @@
+<<<<<<< HEAD
 # (Moved) Translation of the Modern JavaScript Tutorial 
 
 This repo was used to host the information about  the Modern JavaScript Tutorial translation.
@@ -6,3 +7,80 @@ Right now we have it on-site: <https://javascript.info/translate>.
 
 Also, individual languages have their own repositories, please see the page above.
 
+=======
+# Translation of the Modern JavaScript Tutorial
+
+This repo hosts the general information and tools to translate the Modern JavaScript Tutorial <https://javascript.info>.
+
+| Language | Link to GitHub | Translated (%) | &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Last&nbsp;Commit&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; | Published |
+|----------|--------|----------------|------------------------------------------------------------------------------------------|-----------|
+| Chinese | [Contribute](https://github.com/javascript-tutorial/zh.javascript.info) | ![](https://translate.javascript.info/translate/percent/zh.svg) | ![](https://translate.javascript.info/translate/updated/zh.svg) |  [zh.javascript.info](https://zh.javascript.info)  |
+| French | [Contribute](https://github.com/javascript-tutorial/fr.javascript.info) | ![](https://translate.javascript.info/translate/percent/fr.svg) | ![](https://translate.javascript.info/translate/updated/fr.svg) | |
+| Hindi | [Contribute](https://github.com/javascript-tutorial/hi.javascript.info) | ![](https://translate.javascript.info/translate/percent/hi.svg) | ![](https://translate.javascript.info/translate/updated/hi.svg) | |
+| Italian | [Contribute](https://github.com/javascript-tutorial/it.javascript.info) | ![](https://translate.javascript.info/translate/percent/it.svg) | ![](https://translate.javascript.info/translate/updated/it.svg) | |
+| Japanese | [Contribute](https://github.com/javascript-tutorial/ja.javascript.info) | ![](https://translate.javascript.info/translate/percent/ja.svg) | ![](https://translate.javascript.info/translate/updated/ja.svg) |  [ja.javascript.info](https://ja.javascript.info)  |
+| Korean | [Contribute](https://github.com/javascript-tutorial/ko.javascript.info) | ![](https://translate.javascript.info/translate/percent/ko.svg) | ![](https://translate.javascript.info/translate/updated/ko.svg) | |
+| Portuguese (Brazil) | [Contribute](https://github.com/javascript-tutorial/pt-BR.javascript.info) | ![](https://translate.javascript.info/translate/percent/pt-BR.svg) | ![](https://translate.javascript.info/translate/updated/pt-BR.svg) | |
+| Portuguese (Portugal) | [Contribute](https://github.com/javascript-tutorial/pt-PT.javascript.info) | ![](https://translate.javascript.info/translate/percent/pt-PT.svg) | ![](https://translate.javascript.info/translate/updated/pt-PT.svg) | |
+| Romanian | [Contribute](https://github.com/javascript-tutorial/ro.javascript.info) | ![](https://translate.javascript.info/translate/percent/ro.svg) | ![](https://translate.javascript.info/translate/updated/ro.svg) | |
+| Russian | [Contribute](https://github.com/javascript-tutorial/ru.javascript.info) | ![](https://translate.javascript.info/translate/percent/ru.svg) | ![](https://translate.javascript.info/translate/updated/ru.svg) |  [learn.javascript.ru](https://learn.javascript.ru)  |
+| Spanish | [Contribute](https://github.com/javascript-tutorial/es.javascript.info) | ![](https://translate.javascript.info/translate/percent/es.svg) | ![](https://translate.javascript.info/translate/updated/es.svg) | |
+| Turkish | [Contribute](https://github.com/javascript-tutorial/tr.javascript.info) | ![](https://translate.javascript.info/translate/percent/tr.svg) | ![](https://translate.javascript.info/translate/updated/tr.svg) | |
+| Ukrainian | [Contribute](https://github.com/javascript-tutorial/uk.javascript.info) | ![](https://translate.javascript.info/translate/percent/uk.svg) | ![](https://translate.javascript.info/translate/updated/uk.svg) | |
+
+Help us to translate: click the "Contribute" link above and read how to do it. That's simple, join in!
+
+## Starting a new translation
+
+Your language is not in the list? 
+
+If you'd like to create a new translation, submit a PR adding a new file `{lang-code}.json`
+to the `langs` folder with the following information:
+
+* [Language code](https://en.wikipedia.org/wiki/List_of_ISO_639-1_codes)
+* List of maintainers (one or more)
+
+For example:
+
+```json
+{
+  "name": "English",
+  "code": "en",
+  "maintainers": ["iliakan", "lex111"]
+}
+```
+
+
+As a maintainer:
+
+- You should know JavaScript well enough to translate and review pull requests of others.
+
+Once the PR is accepted, we will:
+
+* Create a new repository for you at `javascript-tutorial/{lang-code}.javascript.info`.
+* Add/invite all maintainers to the team `translate-{lang-code}` in the javascript-tutorial organization.
+* Create an special issue in the new repository to track your translation progress.
+
+If you are not a member of the organization, you should receive an email invite to join. Please accept this invite so you can get admin access to your repository!
+
+You may want to [pin](https://help.github.com/articles/pinning-an-issue-to-your-repository/) the generated issue to make it easier to find.
+
+See [Maintainer Tips](/MAINTAINER.md) for additional advice on how to manage your repository.
+
+Happy translating!
+
+## Adding a maintainer
+
+If you are currently a maintainer of a translation and want to add another member, send a pull request to this repo updating `langs/{lang-code}.json`, where `{lang-code}` is the language code of the repo you want to be a maintainer of.
+
+If you are interested in becoming a maintainer for a translation, please ask one of the current maintainers if they would like to add you.
+
+## Publishing
+
+When the translation is at least 50% finished, please create an issue in this repository with a request to publish. You're good! 👏
+
+
+## Acknowledgements
+
+The syncing scripts and the translation bot are based off of [react.org-translation](https://github.com/reactjs/reactjs.org-translation) by @tesseralis.
+>>>>>>> minor