Merge branch 'fix-issue-131'

content/get-in-touch/why-i-cant-join-tor-channels/contents.lr

@@ -44,7 +44,7 @@ Then, to complete the registration and ultimately gain access to the #tor-projec
 
 5. Click on the small sentence at the bottom of the square that says: Verify account.
 
-6. Fill out the CAPTCHA that pops up, and click ok.
+6. Fill out the Captcha that pops up, and click ok.
 
 7. A tiny message will appear: "Your NickServ account has been verified."
 

content/glossary/captcha/contents.lr

 _model: word
 ---
-term: CAPTCHA
+term: Captcha
 ---
 definition:
 
-CAPTCHAs are a challenge-response test used in computing to determine whether the user is human or not.
-[Tor](../tor-tor-network-core-tor) users are often served CAPTCHAS because Tor [relays](../relay) make so many requests that sometimes websites have a hard time determining whether or not those requests are coming from humans or bots.
+Captchas are a challenge-response test used in computing to determine whether the user is human or not.
+[Tor](../tor-tor-network-core-tor) users are often served Captchas because Tor [relays](../relay) make so many requests that sometimes websites have a hard time determining whether or not those requests are coming from humans or bots.
 
 ---
 translation:
 ---
-spelling: Always in capital letters: CAPTCHA
+spelling: Only capitalize first letter, as Captcha is now considered a noun

content/tbb/tbb-35/contents.lr

 _model: question
 ---
-title: Can you get rid of all the CAPTCHAs?
+title: Can you get rid of all the Captchas?
 ---
 seo_slug: get-rid-of-captchas
 ---
 description:
-Unfortunately, some websites deliver CAPTCHAs to Tor users, and we are not able to remove CAPTCHAs from websites.
-The best thing to do in these cases is to contact the website owners, and inform them that their CAPTCHAs are preventing users such as yourself from using their services.
+Unfortunately, some websites deliver Captchas to Tor users, and we are not able to remove Captchas from websites.
+The best thing to do in these cases is to contact the website owners, and inform them that their Captchas are preventing users such as yourself from using their services.

content/tbb/tbb-44/contents.lr

 _model: question
 ---
-title: Google makes me solve a CAPTCHA or tells me I have spyware installed
+title: Google makes me solve a Captcha or tells me I have spyware installed
 ---
 description: