From 5eaf95b3282dca099218ed6742dc26cbbba719fa Mon Sep 17 00:00:00 2001
From: Gerhard Schlager <mail@gerhard-schlager.at>
Date: Sat, 27 Jun 2015 14:50:13 +0200
Subject: [PATCH] FIX: Remove invalid translation keys from polls plugin

And it changes the file header since it was wrong.
---
 plugins/poll/config/locales/client.en.yml | 18 +++++++++++++-----
 plugins/poll/config/locales/server.en.yml | 15 ++++++++++++---
 2 files changed, 25 insertions(+), 8 deletions(-)

diff --git a/plugins/poll/config/locales/client.en.yml b/plugins/poll/config/locales/client.en.yml
index ffafed3c9e1..586a8dfaf59 100644
--- a/plugins/poll/config/locales/client.en.yml
+++ b/plugins/poll/config/locales/client.en.yml
@@ -1,19 +1,27 @@
 # encoding: utf-8
+# This file contains content for the client portion of the poll plugin, sent out
+# to the Javascript app.
 #
-# Never edit this file. It will be overwritten when translations are pulled from Transifex.
-#
-# To work with us on translations, join this project:
+# To work with us on translations, see:
 # https://www.transifex.com/projects/p/discourse-org/
+#
+# This is a "source" file, which is used by Transifex to get translations for other languages.
+# After this file is changed, it needs to be pushed by a maintainer to Transifex:
+#
+#   tx push -s
+#
+# Read more here: https://meta.discourse.org/t/contribute-a-translation-to-discourse/14882
+#
+# To validate this YAML file after you change it, please paste it into
+# http://yamllint.com/
 
 en:
   js:
     poll:
       voters:
-        zero: "voters"
         one: "voter"
         other: "voters"
       total_votes:
-        zero: "total votes"
         one: "total vote"
         other: "total votes"
 
diff --git a/plugins/poll/config/locales/server.en.yml b/plugins/poll/config/locales/server.en.yml
index f78da1322bf..dd1e4a5da9f 100644
--- a/plugins/poll/config/locales/server.en.yml
+++ b/plugins/poll/config/locales/server.en.yml
@@ -1,9 +1,18 @@
 # encoding: utf-8
+# This file contains content for the server portion of the poll plugin used by Ruby
 #
-# Never edit this file. It will be overwritten when translations are pulled from Transifex.
-#
-# To work with us on translations, join this project:
+# To work with us on translations, see:
 # https://www.transifex.com/projects/p/discourse-org/
+#
+# This is a "source" file, which is used by Transifex to get translations for other languages.
+# After this file is changed, it needs to be pushed by a maintainer to Transifex:
+#
+#   tx push -s
+#
+# Read more here: https://meta.discourse.org/t/contribute-a-translation-to-discourse/14882
+#
+# To validate this YAML file after you change it, please paste it into
+# http://yamllint.com/
 
 en:
   site_settings: