Merge pull request #14 from javascript-tutorial/sync-dccca58f

merging all conflicts

Author: ockley

README.md

@@ -2,6 +2,32 @@
 
 This repository hosts the translation of <https://javascript.info> in Danish.
 
+
+
+**That's how you can contribute:**
+
+- See the [Danish Translate Progress](https://github.com/javascript-tutorial/da.javascript.info/issues/1) issue.
+- Choose an unchecked article you'd like to translate.
+- Add a comment with the article title to the issue, e.g. `An Introduction to JavaScript`.
+    - Our bot will mark it in the issue, for everyone to know that you're translating it.
+    - Your comment should contain only the title.
+- Fork the repository, translate and send a PR when done.
+    - PR title should match article title, the bot will write it's number into the issue.
+
+Please kindly allow maintainers to review and merge or request changes in your translation.
+   
+If maintainers do not respond, or if you'd like to become a maintainer, write us at the [main repo](https://github.com/javascript-tutorial/en.javascript.info/issues/new).
+    
+**Let others know what you're translating, in message boards or chats in your language. Invite them to join!**
+
+🎉 Thank you!
+
+Your name and the contribution size will appear in the "About project" page when the translation gets published.
+
+P.S. The full list of languages can be found at <https://javascript.info/translate>.
+
+This repository hosts the translation of <https://javascript.info> in Danish.
+
 **That's how you can contribute:**
 
 - See the [Danish Translate Progress](https://github.com/javascript-tutorial/da.javascript.info/issues/1) issue.
@@ -52,6 +78,69 @@ If you see that the English version can be improved – great, please send a PR
 - For other terms like `resolved promise`, `slash`, `regexp`, and so on - look for a glossary, hopefully there's one for your language already. If not, look for translations in manuals, such as [MDN](https://developer.mozilla.org/en-US/).
 
 
+### Terms with meaning
+
+In English many terms have an obvious meaning. For a person who doesn't understand English, there's no such meaning.
+
+Please keep that in mind, sometimes explanations or additional translations are needed, e.g.
+
+```md
+`ReadableStream` objects allows to read data chunk-by-chunk.
+```
+
+```md
+`ReadableStream` ("flujo legible") objeto ... 
+```
+
+### Text in Code Blocks
+
+- Translate comments.
+- Translate user-messages and example strings.
+- Don't translate variables, classes, identifiers.
+- Ensure that the code works after the translation :)
+
+Example:
+
+```js
+// Example
+const text = "Hello, world";
+document.querySelector('.hello').innerHTML = text;
+```
+
+✅ DO (translate comment):
+
+```js
+// Ejemplo
+const text = 'Hola mundo';
+document.querySelector('.hello').innerHTML = text;
+```
+
+Every chapter, an article or a task resides in its own folder.
+
+The folder is named `N-url`, where `N` – is the number for sorting (articles are ordered), and `url` is the URL-slug on the site.
+
+The folder has one of files:
+
+- `index.md` for a section,
+- `article.md` for an article,
+- `task.md` for a task formulation (+`solution.md` with the solution text if any).
+
+A file starts with the `# Title Header`, and then the text in Markdown-like format, editable in a simple text editor. 
+
+Additional resources and examples for the article or the task, are also in the same folder.
+
+## Translation Tips
+
+Please keep line breaks and paragraphs "as is": don't add newlines and don't remove existing ones. Makes it easy to merge future changes from the English version into the translation. 
+
+If you see that the English version can be improved – great, please send a PR to it.
+
+### Terms
+
+- Some specification terms are not to be translated, e.g. "Function Declaration" can be left "as is".
+- For other terms like `resolved promise`, `slash`, `regexp`, and so on - look for a glossary, hopefully there's one for your language already. If not, look for translations in manuals, such as [MDN](https://developer.mozilla.org/en-US/).
+
+
 ### Terms with meaning
 
 In English many terms have an obvious meaning. For a person who doesn't understand English, there's no such meaning.
@@ -101,14 +190,11 @@ document.querySelector('.hola').innerHTML = text;
 
 Please note, that sometimes code is followed by pictures, and if you translate text `Hello` -> `Hola` in the code, you need to translate text in picturess as well.
 
-<<<<<<< HEAD
 In that case it's probably easier not to translate such text. See more about translating images later.
-=======
+
   - `index.md` stands for a chapter
   - `article.md` stands for an article
   - `task.md` stands for a task (solution must be provided in `solution.md` file as well)
->>>>>>> 99e59ba611ab11319ef9d0d66734b0bea2c3f058
-
 
 ### External Links