Sync with angular.io

Fetch and merge updates from angular.io

By adding angular/angular.io as one of the remote repositories at our local repository, we are able to fetch and merge updates from angular.io the same way as we sync a fork on github, as explained here.

However, we often face conflicts. There are a number of other ways to resolve conflicts, but we choose to use WebStorm/Intellij as explained here.

In the “Merge Revisions” window, we recommend you to update the translation on the spot, especially when the changes are minor. Sometimes there are too many changes, we could simply “Accept Right” to use the new version, give up our translation all together and re-translate the file from scratch. Sometimes it is more efficient to note down the line numbers and update the translation in an editor later. It is entirely your own judgement.

After all conflicts are solved and all translation are adjusted accordingly, commit and push to your remote repository.