Issue #1170 More progress migrating adblockplus.org to our CMS.

locales/en/faq_project.json

Index: locales/en/faq_project.json
===================================================================
--- a/locales/en/faq_project.json
+++ b/locales/en/faq_project.json
@@ -18,117 +18,78 @@
     "message": "Why is it so difficult to add an option for ...?"
   },
   "s6": {
-    "message": "It isn't. But the \"options for everything\" approach has its consequences. I will simply quote"
+    "message": "It isn't. But the \"options for everything\" approach has its consequences. I will simply quote <a>Joel Spolsky</a> on this:"
   },
   "s7": {
-    "message": "http://www.joelonsoftware.com/uibook/chapters/fog0000000059.html"
+    "message": "Every time you provide an option, you're asking the user to make a decision."
   },
   "s8": {
-    "message": "Joel Spolsky"
+    "message": "Asking the user to make a decision isn't <em>in itself</em> a bad thing. Freedom of choice can be wonderful. People <em>love</em> to order espresso-based beverages at Starbucks because they get to make so many <em>choices</em>. Grande-half-caf-skim-mocha-Valencia-with-whip. Extra hot!"
   },
   "s9": {
-    "message": "on this:"
+    "message": "The problem comes when you ask them to make a choice that"
   },
   "s10": {
-    "message": "Every time you provide an option, you're asking the user to make a decision."
+    "message": "they don't care about"
   },
   "s11": {
-    "message": "Asking the user to make a decision isn't <em>in itself</em> a bad thing. Freedom of choice can be wonderful. People <em>love</em> to order espresso-based beverages at Starbucks because they get to make so many <em>choices</em>. Grande-half-caf-skim-mocha-Valencia-with-whip. Extra hot!"
+    "message": ". ... it's simply guaranteed to perplex and eventually piss off the user."
   },
   "s12": {
-    "message": "The problem comes when you ask them to make a choice that"
+    "message": "That doesn't mean that every single feature and customization option needs to be removed. But many of them are better off if they are not represented prominently in the user interface since most users won't need them."
   },
   "s13": {
-    "message": "they don't care about"
+    "message": "Why is it so difficult to add a keyboard shortcut for ...?"
   },
   "s14": {
-    "message": ". ... it's simply guaranteed to perplex and eventually piss off the user."
+    "message": "It isn't. However, keyboard shortcuts in the browser window are shared space. It is impossible to use simple shortcuts -- those are already taken by the browser. And even the more complicated Ctrl+Shift+Something shortcuts are used by many extensions. The more shortcut keys we use, the more likely we are going to get conflicts with other extensions. You are free to <a>reconfigure the keyboard shortcuts</a> however."
   },
   "s15": {
-    "message": "That doesn't mean that every single feature and customization option needs to be removed. But many of them are better off if they are not represented prominently in the user interface since most users won't need them."
+    "message": "How can I help?"
   },
   "s16": {
-    "message": "Why is it so difficult to add a keyboard shortcut for ...?"
+    "message": "There is a number of ways how you could contribute to the Adblock Plus project:"
   },
   "s17": {
-    "message": "It isn't. However, keyboard shortcuts in the browser window are shared space. It is impossible to use simple shortcuts -- those are already taken by the browser. And even the more complicated Ctrl+Shift+Something shortcuts are used by many extensions. The more shortcut keys we use, the more likely we are going to get conflicts with other extensions. You are free to <a>reconfigure the keyboard shortcuts</a> however."
+    "message": "Report bugs"
   },
   "s18": {
-    "message": "How can I help?"
+    "message": "If you notice that Adblock Plus isn't behaving the way you think it should -- <a>tell us</a>. There are always situations we didn't test for that might produce incorrect results, we need your help to find those. Please include all the information we need to reproduce the bug: under which conditions does the bug occur, which browser did you use, what was the version of Adblock Plus? Also stay around for follow-up questions we might have and to confirm that the bug was really fixed."
   },
   "s19": {
-    "message": "There is a number of ways how you could contribute to the Adblock Plus project:"
+    "message": "Test development builds"
   },
   "s20": {
-    "message": "Report bugs"
+    "message": "Before a new version of Adblock Plus is released there are always several <a>development builds</a>. The purpose is to catch bugs or even badly designed features before they are released. Subscribe to the <a>RSS feed</a> to know when a development build is released."
   },
   "s21": {
-    "message": "If you notice that Adblock Plus isn't behaving the way you think it should -- <a>tell us</a>. There are always situations we didn't test for that might produce incorrect results, we need your help to find those. Please include all the information we need to reproduce the bug: under which conditions does the bug occur, which browser did you use, what was the version of Adblock Plus? Also stay around for follow-up questions we might have and to confirm that the bug was really fixed."
+    "message": "Help other users"
   },
   "s22": {
-    "message": "Test development builds"
+    "message": "If you are an experienced Adblock Plus user maybe you can spend a little time answering questions of people who are new to this. Have a look at the <a>forum</a>, there are always many users looking for answers."
   },
   "s23": {
-    "message": "Before a new version of Adblock Plus is released there are always several <a>development builds</a>. The purpose is to catch bugs or even badly designed features before they are released. Subscribe to the <a>RSS feed</a> to know when a development build is released."
+    "message": "Bring in your suggestions"
   },
   "s24": {
-    "message": "Help other users"
+    "message": "There is always something that can be improved, so please tell us about your ideas. Ideally you should not only tell us what needs to be changed (this is mostly already known) but also how it should be changed. Feel free to open a new thread in the <a>forum</a> or join an existing discussion. Note that for various reasons not every suggestion will be accepted, and please stay constructive in your criticism."
   },
   "s25": {
-    "message": "If you are an experienced Adblock Plus user maybe you can spend a little time answering questions of people who are new to this. Have a look at the <a>forum</a>, there are always many users looking for answers."
+    "message": "Translate Adblock Plus"
   },
   "s26": {
-    "message": "Bring in your suggestions"
+    "message": "Currently Adblock Plus has been translated into more than 30 languages -- and yet we still need translators for some languages. If you want to contribute in this way please register on <a>BabelZilla</a>, go to the <a>Adblock Plus topic</a> and follow the \"View on WTS\" link in the first post. Claim any of the languages that don't have a translator assigned yet for yourself. Note that you should only do it if you are willing to update your translation for new Adblock Plus versions (BabelZilla will notify you whenever this becomes necessary). Read the <a>BabelZilla FAQ</a> to learn more about WTS (Web Translation System)."
   },
   "s27": {
-    "message": "There is always something that can be improved, so please tell us about your ideas. Ideally you should not only tell us what needs to be changed (this is mostly already known) but also how it should be changed. Feel free to open a new thread in the <a>forum</a> or join an existing discussion. Note that for various reasons not every suggestion will be accepted, and please stay constructive in your criticism."
+    "message": "Spread the word"
   },
   "s28": {
-    "message": "Translate Adblock Plus"
+    "message": "Forgive the misuse of this slogan but telling other people about Adblock Plus is also an appreciated contribution. While nobody profits directly from it, widespread adoption of ad blocking software will make intrusive ads economically inefficient until they become as rare as pop-up windows already are today. And aside of making the internet a better place it is simply good to know that this work is used."
   },
   "s29": {
-    "message": "Currently Adblock Plus has been translated into more than 30 languages -- and yet we still need translators for some languages. If you want to contribute in this way please register on"
+    "message": "Make a donation"
   },
   "s30": {
-    "message": "http://www.babelzilla.org/"
-  },
-  "s31": {
-    "message": "BabelZilla"
-  },
-  "s32": {
-    "message": ", go to the"
-  },
-  "s33": {
-    "message": "http://www.babelzilla.org/forum/index.php?showtopic=1898"
-  },
-  "s34": {
-    "message": "Adblock Plus topic"
-  },
-  "s35": {
-    "message": "and follow the \"View on WTS\" link in the first post. Claim any of the languages that don't have a translator assigned yet for yourself. Note that you should only do it if you are willing to update your translation for new Adblock Plus versions (BabelZilla will notify you whenever this becomes necessary). Read the"
-  },
-  "s36": {
-    "message": "http://www.babelzilla.org/index.php?option=com_content&task=category&sectionid=3&id=7&Itemid=25"
-  },
-  "s37": {
-    "message": "BabelZilla FAQ"
-  },
-  "s38": {
-    "message": "to learn more about WTS (Web Translation System)."
-  },
-  "s39": {
-    "message": "Spread the word"
-  },
-  "s40": {
-    "message": "Forgive the misuse of this slogan but telling other people about Adblock Plus is also an appreciated contribution. While nobody profits directly from it, widespread adoption of ad blocking software will make intrusive ads economically inefficient until they become as rare as pop-up windows already are today. And aside of making the internet a better place it is simply good to know that this work is used."
-  },
-  "s41": {
-    "message": "Make a donation"
-  },
-  "s42": {
-    "message": "With more funds we will be able to improve Adblock Plus faster."
-  },
-  "s43": {
-    "message": "You can make a donation on the <a>contribution page</a>."
+    "message": "With more funds we will be able to improve Adblock Plus faster. You can make a donation on the <a>contribution page</a>."
   }
 }