keep French l10n up to date
Updated zh_CN & zh_TW translations to the latest en.yml
Merge pull request #706 from ZogStriP/keep-french-l10n-up-to-date-2013-04-12

keep French l10n up to date
Merge pull request #707 from tangramor/master

Update the zh_CN and zh_TW translations to the latest en.yml
Merge pull request #24 from discourse/master

fast forward