minor

Author: iliakan

lib/init/Readme.template.md

@@ -9,6 +9,8 @@ Please help us to make the translation better.
 - Add a comment to that issue to inform the maintainer that you're translating it.
 - Fork the repository, translate and send a PR when done.
 
+Also let others know what you're translating, in message boards or chats in your language. Invite them to join!
+
 🎉 Thank you!
 
 <% if (langInfo.published) { -%>

lib/sync.js

@@ -87,26 +87,36 @@ Please fix the conflicts by pushing new commits to this pull request, either by
     conflictList = 'No conflicts were found.';
   }
 
+  let tips = '';
+  if (conflictList) {
+    tips = `
+We recommend to merge conflicting changes manually and close this PR.
 
-  const body = `
-This PR was automatically generated.
-Merge changes from [en.javascript.info](https://github.com/${config.org}/${config.langMain}.${config.repoSuffix}/commits/master) at ${shortHash}
-
-${conflictList}
-
-You can also close this PR and merge the changes manually:
-1. \`git add remote upstream https://github.com/javascript-tutorial/en.javascript.info\`
+The steps are: 
+1. Setup upstream (if haven't yet)
+    - \`git add remote upstream https://github.com/javascript-tutorial/en.javascript.info\` 
 2. Commit all current work and \`git checkout master\`
-3. Pull from the English version \`git pull upstream master\`
-4. Deal with the conflicts. If there are many changes in a file, e.g. \`README.md\`, then you could:  
+3. Pull the recent changes from the English version:
+    - \`git pull upstream master\`
+4. Deal with the conflicts. If a conflict touches a few lines, then just fix them. Otherwise, if there are many changes, you can see them like this:  
     - Checkout your version, \`git checkout --ours README.md\`
     - See what changed in the original file: 
-        - \`git diff --word-diff master...upstream/master README.md\` (three dots)
-    - Update your version
-    - \`git commit -m synced README.md\`
+        - \`git diff --word-diff master...upstream/master README.md\` (please note: three dots in the command)
+    - Re-translate or otherwise sync the translated version and commit it:
+        - \`git commit -m synced README.md\`
 5. When conflicts resolved, \`git push origin master\`
 
 P.S. **Don't squash and merge** if GitHub offers you, as this leads to same conflicts re-appear in the future.
+`;
+  }
+
+  const body = `
+This PR was automatically generated.
+Merge changes from [en.javascript.info](https://github.com/${config.org}/${config.langMain}.${config.repoSuffix}/commits/master) at ${shortHash}
+
+${conflictList}
+
+${tips}
 `;
 
   try {