translating....
Merge branch 'master' of https://github.com/LCTT/TranslateProject
Merge branch 'master' of https://github.com/LCTT/TranslateProject

merge
# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.
modified (1)
Merge branch 'master' of https://github.com/LCTT/TranslateProject
Merge branch 'master' of https://github.com/LCTT/TranslateProject
翻译中by runningwater
Merge branch 'master' of https://github.com/LCTT/TranslateProject
being translated by bazz2
翻译完成
Merge branch 'master' of https://github.com/LCTT/TranslateProject
merge
翻译完成
Merge pull request #294 from tinyeyeser/master

已翻译 by小眼儿
翻译中 by小眼儿
完成翻译
Merge branch 'master' of https://github.com/LCTT/TranslateProject

Conflicts:
	sources/di – Disk Information Utility, Better Than df.md
翻译中 by runningwater
translated by bazz2
Merge pull request #293 from bazz2/master

cloud tool is being translated by bazz2
Merge pull request #296 from coolpigs/master

完成翻译