missing word in zen/gtfo
translated new categories + fixed typos
Merge pull request #74 from galaakk/master

fr locale updated
Fix typo in README
Add explanatory tooltip to status bubble in feed partial
Merge pull request #75 from DanielleSucher/copyediting

Fix typo in README [ci skip]
allow 2.0 build to fail for now - seems a bit flaky
Update zh_CN.yml for working with new archive page
Merge remote-tracking branch 'upstream/master' into simplified-chinese-translation

Merge new upstream code
Merge pull request #78 from edgarwang/simplified-chinese-translation

Update simplified chinese translation
Internationalize status bubble tooltip text
Use Twitter Bootstrap tooltips for status bubble text
Merge pull request #76 from DanielleSucher/status-bubble-tooltip

Add explanatory tooltip to status bubble in feed partial
fixup tooltip styles.
Update simplified chinese translation for new explanatory tooltip
Merge pull request #79 from edgarwang/simplified-chinese-translation

Update simplified chinese translation for new explanatory tooltip