Update from master#2

Merged

umutphp merged 13 commits intoumutphp:masterfrom

shieldfy:master

May 10, 2020

Commits on Jul 2, 2019

Sync some missing entries; fix some typos; etc.
Maikuolan
committed

Commits on Sep 23, 2019

Commits on Oct 18, 2019

Fix misdescriptions in zh version
Vincent Ting
committed

Commits on Dec 22, 2019

Merge pull request #134 from vincenting/master
Maikuolan
authored

Commits on Apr 29, 2020

Commits on May 10, 2020

Merge pull request #139 from hylerrix-coop/master
Maikuolan
authored