Signed-off-by: bazz2 <chenjt1989@sina.com>
Merge branch 'master' of https://github.com/bazz2/TranslateProject

Conflicts:
	sources/tech/Install Terminator--Multiple GNOME terminals in one window.md