cs translation update
keep French l10n up to date

:fr:
In client.en.yml, add a comma after a leading sorry

Add a comma after the leading sorry to keep things consistent.
Add sample Capistrano deployment files

Add the following sample Capistrano configuration files to ease
deployment to a VPS using Capistrano:

 * `config/deploy.rb.sample`
 * `config/thin.yml.sample`
 * `Capfile.sample`

The sample Capfile will additionally load any recipes provided by
Discourse plugins.

Signed-off-by: David Celis <me@davidcel.is>
we can't trust CSRF for anon the way it is designed.
The page they have loaded may be cached we need a different way of delivering the CSRF potentially
deleting posts as an admin was bust
Merge pull request #809 from goodbrews/capistrano-samples

Add sample Capistrano deployment files
Merge pull request #807 from ZogStriP/keep-french-l10n-up-to-date

keep French l10n up to date
Merge pull request #808 from 9034725985/patch-1

In client.en.yml, add a comma after a leading sorry
Merge pull request #805 from kubabrecka/cs_update41

cs translation update
Updated the zh locales
Merge pull request #811 from emberjs-cn/update-zh-locales

Updated the zh locales
Update discourse.pill.sample to match the nginx.sample.conf
Reply button at bottom of topic doesn't ask you to abandon your post when you click it more than once
Make enter key work to submit the signup form
Merge remote-tracking branch 'upstream/master'
Merge branch 'master' into heroku_mods