[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]

[tor-commits] [translation/support-topics] Update translations for support-topics



commit e4edc108816577f23ab0905fab1be582ae048f31
Author: Translation commit bot <translation@xxxxxxxxxxxxxx>
Date:   Fri Apr 27 01:21:46 2018 +0000

    Update translations for support-topics
---
 ach.json            | 20 ++++++++++----------
 af.json             | 20 ++++++++++----------
 ak.json             | 20 ++++++++++----------
 am.json             | 20 ++++++++++----------
 ar.json             | 20 ++++++++++----------
 arn.json            | 20 ++++++++++----------
 ast.json            | 20 ++++++++++----------
 az.json             | 20 ++++++++++----------
 be.json             | 20 ++++++++++----------
 bg.json             | 20 ++++++++++----------
 bn.json             | 20 ++++++++++----------
 bn_BD.json          | 20 ++++++++++----------
 bn_IN.json          | 20 ++++++++++----------
 bo.json             | 20 ++++++++++----------
 br.json             | 20 ++++++++++----------
 brx.json            | 20 ++++++++++----------
 bs.json             | 20 ++++++++++----------
 ca.json             | 20 ++++++++++----------
 cs.json             | 20 ++++++++++----------
 csb.json            | 20 ++++++++++----------
 cv.json             | 20 ++++++++++----------
 cy.json             | 20 ++++++++++----------
 da.json             | 20 ++++++++++----------
 de.json             | 20 ++++++++++----------
 dz.json             | 20 ++++++++++----------
 el.json             | 20 ++++++++++----------
 en_GB.json          | 20 ++++++++++----------
 eo.json             | 20 ++++++++++----------
 es.json             | 20 ++++++++++----------
 es_AR.json          | 20 ++++++++++----------
 es_CL.json          | 20 ++++++++++----------
 es_CO.json          | 20 ++++++++++----------
 es_MX.json          | 20 ++++++++++----------
 et.json             | 20 ++++++++++----------
 eu.json             | 20 ++++++++++----------
 fa.json             | 20 ++++++++++----------
 fi.json             | 20 ++++++++++----------
 fil.json            | 20 ++++++++++----------
 fo.json             | 20 ++++++++++----------
 fr.json             | 20 ++++++++++----------
 fr_CA.json          | 20 ++++++++++----------
 fur.json            | 20 ++++++++++----------
 fy.json             | 20 ++++++++++----------
 ga.json             | 20 ++++++++++----------
 gd.json             | 20 ++++++++++----------
 gl.json             | 20 ++++++++++----------
 gu.json             | 20 ++++++++++----------
 gu_IN.json          | 20 ++++++++++----------
 gun.json            | 20 ++++++++++----------
 ha.json             | 20 ++++++++++----------
 he.json             | 20 ++++++++++----------
 hi.json             | 20 ++++++++++----------
 hr.json             | 20 ++++++++++----------
 hr_HR.json          | 20 ++++++++++----------
 ht.json             | 20 ++++++++++----------
 hu.json             | 20 ++++++++++----------
 hy.json             | 20 ++++++++++----------
 ia.json             | 20 ++++++++++----------
 id.json             | 20 ++++++++++----------
 is.json             | 20 ++++++++++----------
 it.json             | 20 ++++++++++----------
 ja.json             | 20 ++++++++++----------
 jv.json             | 20 ++++++++++----------
 ka.json             | 20 ++++++++++----------
 kk.json             | 20 ++++++++++----------
 km.json             | 20 ++++++++++----------
 kn.json             | 20 ++++++++++----------
 ko.json             | 20 ++++++++++----------
 ko_KR.json          | 20 ++++++++++----------
 ku.json             | 20 ++++++++++----------
 ku_IQ.json          | 20 ++++++++++----------
 kw.json             | 20 ++++++++++----------
 ky.json             | 20 ++++++++++----------
 la.json             | 20 ++++++++++----------
 lb.json             | 20 ++++++++++----------
 lg.json             | 20 ++++++++++----------
 ln.json             | 20 ++++++++++----------
 lo.json             | 20 ++++++++++----------
 lt.json             | 20 ++++++++++----------
 lv.json             | 20 ++++++++++----------
 mg.json             | 20 ++++++++++----------
 mi.json             | 20 ++++++++++----------
 mk.json             | 20 ++++++++++----------
 ml.json             | 20 ++++++++++----------
 mn.json             | 20 ++++++++++----------
 mr.json             | 20 ++++++++++----------
 ms_MY.json          | 20 ++++++++++----------
 mt.json             | 20 ++++++++++----------
 my.json             | 20 ++++++++++----------
 nah.json            | 20 ++++++++++----------
 nap.json            | 20 ++++++++++----------
 nb.json             | 20 ++++++++++----------
 ne.json             | 20 ++++++++++----------
 nl.json             | 20 ++++++++++----------
 nl_BE.json          | 20 ++++++++++----------
 nn.json             | 20 ++++++++++----------
 nso.json            | 20 ++++++++++----------
 oc.json             | 20 ++++++++++----------
 om.json             | 20 ++++++++++----------
 or.json             | 20 ++++++++++----------
 pa.json             | 20 ++++++++++----------
 pap.json            | 20 ++++++++++----------
 pl.json             | 20 ++++++++++----------
 pms.json            | 20 ++++++++++----------
 ps.json             | 20 ++++++++++----------
 pt.json             | 20 ++++++++++----------
 pt_BR.json          | 20 ++++++++++----------
 ro.json             | 20 ++++++++++----------
 ru.json             | 20 ++++++++++----------
 ru@xxxxxxxxxxxxx    | 20 ++++++++++----------
 sco.json            | 20 ++++++++++----------
 si_LK.json          | 20 ++++++++++----------
 sk.json             | 20 ++++++++++----------
 sk_SK.json          | 20 ++++++++++----------
 sl.json             | 20 ++++++++++----------
 sl_SI.json          | 20 ++++++++++----------
 sn.json             | 20 ++++++++++----------
 so.json             | 20 ++++++++++----------
 son.json            | 20 ++++++++++----------
 sq.json             | 20 ++++++++++----------
 sr.json             | 20 ++++++++++----------
 sr@xxxxxxxxxx       | 20 ++++++++++----------
 st.json             | 20 ++++++++++----------
 su.json             | 20 ++++++++++----------
 support-topics.json | 20 ++++++++++----------
 sv.json             | 20 ++++++++++----------
 sw.json             | 20 ++++++++++----------
 ta.json             | 20 ++++++++++----------
 te.json             | 20 ++++++++++----------
 tg.json             | 20 ++++++++++----------
 th.json             | 20 ++++++++++----------
 ti.json             | 20 ++++++++++----------
 tk.json             | 20 ++++++++++----------
 tr.json             | 20 ++++++++++----------
 ug@xxxxxxxxx        | 20 ++++++++++----------
 uk.json             | 20 ++++++++++----------
 ur.json             | 20 ++++++++++----------
 ur_PK.json          | 20 ++++++++++----------
 uz.json             | 20 ++++++++++----------
 ve.json             | 20 ++++++++++----------
 vi.json             | 20 ++++++++++----------
 wa.json             | 20 ++++++++++----------
 wo.json             | 20 ++++++++++----------
 zh_CN.json          | 20 ++++++++++----------
 zh_HK.json          | 20 ++++++++++----------
 zh_TW.json          | 20 ++++++++++----------
 zu.json             | 20 ++++++++++----------
 147 files changed, 1470 insertions(+), 1470 deletions(-)

diff --git a/ach.json b/ach.json
index 7b9006505..63a46e0ca 100644
--- a/ach.json
+++ b/ach.json
@@ -5,18 +5,18 @@
 	"label": "Most Frequently Asked Questions"
     },
     "tbb": {
-	"path": "#tor-browser",
-	"control": "tor-browser",
+	"path": "#tbb",
+	"control": "tbb",
 	"label": "Tor Browser"
     },
     "tormessenger": {
-	"path": "#tor-messenger",
-	"control": "tor-messenger",
+	"path": "#tormessenger",
+	"control": "tormessenger",
 	"label": "Tor Messenger"
     },
     "tormobile": {
-	"path": "#tor-mobile",
-	"control": "tor-mobile",
+	"path": "#tormobile",
+	"control": "tormobile",
 	"label": "Tor Mobile"
     },
     "gettor": {
@@ -25,8 +25,8 @@
 	"label": "GetTor"
     },
     "connecting": {
-	"path": "#connecting-to-tor",
-	"control": "connecting-to-tor",
+	"path": "#connectingtotor",
+	"control": "connectingtotor",
 	"label": "Connecting To Tor"
     },
     "censorship": {
@@ -45,8 +45,8 @@
 	"label": "Operators"
     },
     "onionservices": {
-	"path": "#onion-services",
-	"control": "onion-services",
+	"path": "#onionservices",
+	"control": "onionservices",
 	"label": "Onion Services"
     },
     "misc": {
diff --git a/af.json b/af.json
index 7b9006505..63a46e0ca 100644
--- a/af.json
+++ b/af.json
@@ -5,18 +5,18 @@
 	"label": "Most Frequently Asked Questions"
     },
     "tbb": {
-	"path": "#tor-browser",
-	"control": "tor-browser",
+	"path": "#tbb",
+	"control": "tbb",
 	"label": "Tor Browser"
     },
     "tormessenger": {
-	"path": "#tor-messenger",
-	"control": "tor-messenger",
+	"path": "#tormessenger",
+	"control": "tormessenger",
 	"label": "Tor Messenger"
     },
     "tormobile": {
-	"path": "#tor-mobile",
-	"control": "tor-mobile",
+	"path": "#tormobile",
+	"control": "tormobile",
 	"label": "Tor Mobile"
     },
     "gettor": {
@@ -25,8 +25,8 @@
 	"label": "GetTor"
     },
     "connecting": {
-	"path": "#connecting-to-tor",
-	"control": "connecting-to-tor",
+	"path": "#connectingtotor",
+	"control": "connectingtotor",
 	"label": "Connecting To Tor"
     },
     "censorship": {
@@ -45,8 +45,8 @@
 	"label": "Operators"
     },
     "onionservices": {
-	"path": "#onion-services",
-	"control": "onion-services",
+	"path": "#onionservices",
+	"control": "onionservices",
 	"label": "Onion Services"
     },
     "misc": {
diff --git a/ak.json b/ak.json
index 7b9006505..63a46e0ca 100644
--- a/ak.json
+++ b/ak.json
@@ -5,18 +5,18 @@
 	"label": "Most Frequently Asked Questions"
     },
     "tbb": {
-	"path": "#tor-browser",
-	"control": "tor-browser",
+	"path": "#tbb",
+	"control": "tbb",
 	"label": "Tor Browser"
     },
     "tormessenger": {
-	"path": "#tor-messenger",
-	"control": "tor-messenger",
+	"path": "#tormessenger",
+	"control": "tormessenger",
 	"label": "Tor Messenger"
     },
     "tormobile": {
-	"path": "#tor-mobile",
-	"control": "tor-mobile",
+	"path": "#tormobile",
+	"control": "tormobile",
 	"label": "Tor Mobile"
     },
     "gettor": {
@@ -25,8 +25,8 @@
 	"label": "GetTor"
     },
     "connecting": {
-	"path": "#connecting-to-tor",
-	"control": "connecting-to-tor",
+	"path": "#connectingtotor",
+	"control": "connectingtotor",
 	"label": "Connecting To Tor"
     },
     "censorship": {
@@ -45,8 +45,8 @@
 	"label": "Operators"
     },
     "onionservices": {
-	"path": "#onion-services",
-	"control": "onion-services",
+	"path": "#onionservices",
+	"control": "onionservices",
 	"label": "Onion Services"
     },
     "misc": {
diff --git a/am.json b/am.json
index 75ab32268..d1c608bc8 100644
--- a/am.json
+++ b/am.json
@@ -5,18 +5,18 @@
 	"label": "Most Frequently Asked Questions"
     },
     "tbb": {
-	"path": "#tor-browser",
-	"control": "tor-browser",
+	"path": "#tbb",
+	"control": "tbb",
 	"label": "Tor Browser"
     },
     "tormessenger": {
-	"path": "#tor-messenger",
-	"control": "tor-messenger",
+	"path": "#tormessenger",
+	"control": "tormessenger",
 	"label": "Tor Messenger"
     },
     "tormobile": {
-	"path": "#tor-mobile",
-	"control": "tor-mobile",
+	"path": "#tormobile",
+	"control": "tormobile",
 	"label": "Tor Mobile"
     },
     "gettor": {
@@ -25,8 +25,8 @@
 	"label": "GetTor"
     },
     "connecting": {
-	"path": "#connecting-to-tor",
-	"control": "connecting-to-tor",
+	"path": "#connectingtotor",
+	"control": "connectingtotor",
 	"label": "Connecting To Tor"
     },
     "censorship": {
@@ -45,8 +45,8 @@
 	"label": "Operators"
     },
     "onionservices": {
-	"path": "#onion-services",
-	"control": "onion-services",
+	"path": "#onionservices",
+	"control": "onionservices",
 	"label": "Onion Services"
     },
     "misc": {
diff --git a/ar.json b/ar.json
index 96cfc6f0e..06b6f1378 100644
--- a/ar.json
+++ b/ar.json
@@ -5,18 +5,18 @@
 	"label": "اÙ?أسئÙ?Ø© اÙ?شائعة"
     },
     "tbb": {
-	"path": "#tor-browser",
-	"control": "tor-browser",
+	"path": "#tbb",
+	"control": "tbb",
 	"label": "Ù?تصÙ?Ø­ تÙ?ر"
     },
     "tormessenger": {
-	"path": "#tor-messenger",
-	"control": "tor-messenger",
+	"path": "#tormessenger",
+	"control": "tormessenger",
 	"label": "Tor Messenger"
     },
     "tormobile": {
-	"path": "#tor-mobile",
-	"control": "tor-mobile",
+	"path": "#tormobile",
+	"control": "tormobile",
 	"label": "Tor Mobile"
     },
     "gettor": {
@@ -25,8 +25,8 @@
 	"label": "GetTor"
     },
     "connecting": {
-	"path": "#connecting-to-tor",
-	"control": "connecting-to-tor",
+	"path": "#connectingtotor",
+	"control": "connectingtotor",
 	"label": "اÙ?إتصاÙ? بشبÙ?Ø© تÙ?ر"
     },
     "censorship": {
@@ -45,8 +45,8 @@
 	"label": "Operators"
     },
     "onionservices": {
-	"path": "#onion-services",
-	"control": "onion-services",
+	"path": "#onionservices",
+	"control": "onionservices",
 	"label": "خدÙ?ات اÙ?بصÙ?Ø© Onion"
     },
     "misc": {
diff --git a/arn.json b/arn.json
index 7b9006505..63a46e0ca 100644
--- a/arn.json
+++ b/arn.json
@@ -5,18 +5,18 @@
 	"label": "Most Frequently Asked Questions"
     },
     "tbb": {
-	"path": "#tor-browser",
-	"control": "tor-browser",
+	"path": "#tbb",
+	"control": "tbb",
 	"label": "Tor Browser"
     },
     "tormessenger": {
-	"path": "#tor-messenger",
-	"control": "tor-messenger",
+	"path": "#tormessenger",
+	"control": "tormessenger",
 	"label": "Tor Messenger"
     },
     "tormobile": {
-	"path": "#tor-mobile",
-	"control": "tor-mobile",
+	"path": "#tormobile",
+	"control": "tormobile",
 	"label": "Tor Mobile"
     },
     "gettor": {
@@ -25,8 +25,8 @@
 	"label": "GetTor"
     },
     "connecting": {
-	"path": "#connecting-to-tor",
-	"control": "connecting-to-tor",
+	"path": "#connectingtotor",
+	"control": "connectingtotor",
 	"label": "Connecting To Tor"
     },
     "censorship": {
@@ -45,8 +45,8 @@
 	"label": "Operators"
     },
     "onionservices": {
-	"path": "#onion-services",
-	"control": "onion-services",
+	"path": "#onionservices",
+	"control": "onionservices",
 	"label": "Onion Services"
     },
     "misc": {
diff --git a/ast.json b/ast.json
index 013583f88..0bcfc1fae 100644
--- a/ast.json
+++ b/ast.json
@@ -5,18 +5,18 @@
 	"label": "Most Frequently Asked Questions"
     },
     "tbb": {
-	"path": "#tor-browser",
-	"control": "tor-browser",
+	"path": "#tbb",
+	"control": "tbb",
 	"label": "Navegador Tor"
     },
     "tormessenger": {
-	"path": "#tor-messenger",
-	"control": "tor-messenger",
+	"path": "#tormessenger",
+	"control": "tormessenger",
 	"label": "Tor Messenger"
     },
     "tormobile": {
-	"path": "#tor-mobile",
-	"control": "tor-mobile",
+	"path": "#tormobile",
+	"control": "tormobile",
 	"label": "Tor Mobile"
     },
     "gettor": {
@@ -25,8 +25,8 @@
 	"label": "GetTor"
     },
     "connecting": {
-	"path": "#connecting-to-tor",
-	"control": "connecting-to-tor",
+	"path": "#connectingtotor",
+	"control": "connectingtotor",
 	"label": "Connecting To Tor"
     },
     "censorship": {
@@ -45,8 +45,8 @@
 	"label": "Operators"
     },
     "onionservices": {
-	"path": "#onion-services",
-	"control": "onion-services",
+	"path": "#onionservices",
+	"control": "onionservices",
 	"label": "Onion Services"
     },
     "misc": {
diff --git a/az.json b/az.json
index 60bf04f31..4f97b79ce 100644
--- a/az.json
+++ b/az.json
@@ -5,18 +5,18 @@
 	"label": "Most Frequently Asked Questions"
     },
     "tbb": {
-	"path": "#tor-browser",
-	"control": "tor-browser",
+	"path": "#tbb",
+	"control": "tbb",
 	"label": "Tor Brauzer"
     },
     "tormessenger": {
-	"path": "#tor-messenger",
-	"control": "tor-messenger",
+	"path": "#tormessenger",
+	"control": "tormessenger",
 	"label": "Tor Messenger"
     },
     "tormobile": {
-	"path": "#tor-mobile",
-	"control": "tor-mobile",
+	"path": "#tormobile",
+	"control": "tormobile",
 	"label": "Tor Mobile"
     },
     "gettor": {
@@ -25,8 +25,8 @@
 	"label": "GetTor"
     },
     "connecting": {
-	"path": "#connecting-to-tor",
-	"control": "connecting-to-tor",
+	"path": "#connectingtotor",
+	"control": "connectingtotor",
 	"label": "Connecting To Tor"
     },
     "censorship": {
@@ -45,8 +45,8 @@
 	"label": "Operators"
     },
     "onionservices": {
-	"path": "#onion-services",
-	"control": "onion-services",
+	"path": "#onionservices",
+	"control": "onionservices",
 	"label": "Onion Services"
     },
     "misc": {
diff --git a/be.json b/be.json
index 4f8f433ed..b15f95d1f 100644
--- a/be.json
+++ b/be.json
@@ -5,18 +5,18 @@
 	"label": "Most Frequently Asked Questions"
     },
     "tbb": {
-	"path": "#tor-browser",
-	"control": "tor-browser",
+	"path": "#tbb",
+	"control": "tbb",
 	"label": "Tor Browser"
     },
     "tormessenger": {
-	"path": "#tor-messenger",
-	"control": "tor-messenger",
+	"path": "#tormessenger",
+	"control": "tormessenger",
 	"label": "Tor Messenger"
     },
     "tormobile": {
-	"path": "#tor-mobile",
-	"control": "tor-mobile",
+	"path": "#tormobile",
+	"control": "tormobile",
 	"label": "Tor Mobile"
     },
     "gettor": {
@@ -25,8 +25,8 @@
 	"label": "GetTor"
     },
     "connecting": {
-	"path": "#connecting-to-tor",
-	"control": "connecting-to-tor",
+	"path": "#connectingtotor",
+	"control": "connectingtotor",
 	"label": "Connecting To Tor"
     },
     "censorship": {
@@ -45,8 +45,8 @@
 	"label": "Operators"
     },
     "onionservices": {
-	"path": "#onion-services",
-	"control": "onion-services",
+	"path": "#onionservices",
+	"control": "onionservices",
 	"label": "Onion Services"
     },
     "misc": {
diff --git a/bg.json b/bg.json
index 036ace664..1053703f1 100644
--- a/bg.json
+++ b/bg.json
@@ -5,18 +5,18 @@
 	"label": "ЧеÑ?Ñ?о задавани вÑ?пÑ?оÑ?и"
     },
     "tbb": {
-	"path": "#Ñ?оÑ?-бÑ?аÑ?зÑ?Ñ?",
-	"control": "Ñ?оÑ?-бÑ?аÑ?зÑ?Ñ?",
+	"path": "#tbb",
+	"control": "tbb",
 	"label": "Tor Browser"
     },
     "tormessenger": {
-	"path": "#Ñ?оÑ?-меÑ?енджÑ?Ñ?",
-	"control": "Ñ?оÑ?-меÑ?енджÑ?Ñ?",
+	"path": "#tormessenger",
+	"control": "tormessenger",
 	"label": "ТоÑ? Ð?еÑ?енджÑ?Ñ?"
     },
     "tormobile": {
-	"path": "#Ñ?оÑ?-мобилен",
-	"control": "Ñ?оÑ?-мобилен",
+	"path": "#tormobile",
+	"control": "tormobile",
 	"label": "ТоÑ? Ð?обилен"
     },
     "gettor": {
@@ -25,8 +25,8 @@
 	"label": "GetTor"
     },
     "connecting": {
-	"path": "#Ñ?вÑ?Ñ?зване-кÑ?м-Ñ?оÑ?",
-	"control": "Ñ?вÑ?Ñ?зване-кÑ?м-Ñ?оÑ?",
+	"path": "#connectingtotor",
+	"control": "connectingtotor",
 	"label": "СвÑ?Ñ?зване кÑ?м ТоÑ?"
     },
     "censorship": {
@@ -45,8 +45,8 @@
 	"label": "Ð?пеÑ?аÑ?оÑ?и"
     },
     "onionservices": {
-	"path": "#onion-Ñ?Ñ?лÑ?ги",
-	"control": "onion-Ñ?Ñ?лÑ?ги",
+	"path": "#onionservices",
+	"control": "onionservices",
 	"label": "Onion Ñ?Ñ?лÑ?ги"
     },
     "misc": {
diff --git a/bn.json b/bn.json
index b4e5fb8c6..ba62b3876 100644
--- a/bn.json
+++ b/bn.json
@@ -5,18 +5,18 @@
 	"label": "Most Frequently Asked Questions"
     },
     "tbb": {
-	"path": "#tor-browser",
-	"control": "tor-browser",
+	"path": "#tbb",
+	"control": "tbb",
 	"label": "�র ব�রা��ার"
     },
     "tormessenger": {
-	"path": "#tor-messenger",
-	"control": "tor-messenger",
+	"path": "#tormessenger",
+	"control": "tormessenger",
 	"label": "Tor Messenger"
     },
     "tormobile": {
-	"path": "#tor-mobile",
-	"control": "tor-mobile",
+	"path": "#tormobile",
+	"control": "tormobile",
 	"label": "Tor Mobile"
     },
     "gettor": {
@@ -25,8 +25,8 @@
 	"label": "GetTor"
     },
     "connecting": {
-	"path": "#connecting-to-tor",
-	"control": "connecting-to-tor",
+	"path": "#connectingtotor",
+	"control": "connectingtotor",
 	"label": "Connecting To Tor"
     },
     "censorship": {
@@ -45,8 +45,8 @@
 	"label": "Operators"
     },
     "onionservices": {
-	"path": "#onion-services",
-	"control": "onion-services",
+	"path": "#onionservices",
+	"control": "onionservices",
 	"label": "Onion Services"
     },
     "misc": {
diff --git a/bn_BD.json b/bn_BD.json
index fed61a0b4..3c643109c 100644
--- a/bn_BD.json
+++ b/bn_BD.json
@@ -5,18 +5,18 @@
 	"label": "Most Frequently Asked Questions"
     },
     "tbb": {
-	"path": "#tor-browser",
-	"control": "tor-browser",
+	"path": "#tbb",
+	"control": "tbb",
 	"label": "�র ব�রা��ার"
     },
     "tormessenger": {
-	"path": "#tor-messenger",
-	"control": "tor-messenger",
+	"path": "#tormessenger",
+	"control": "tormessenger",
 	"label": "Tor Messenger"
     },
     "tormobile": {
-	"path": "#tor-mobile",
-	"control": "tor-mobile",
+	"path": "#tormobile",
+	"control": "tormobile",
 	"label": "Tor Mobile"
     },
     "gettor": {
@@ -25,8 +25,8 @@
 	"label": "GetTor"
     },
     "connecting": {
-	"path": "#connecting-to-tor",
-	"control": "connecting-to-tor",
+	"path": "#connectingtotor",
+	"control": "connectingtotor",
 	"label": "Connecting To Tor"
     },
     "censorship": {
@@ -45,8 +45,8 @@
 	"label": "Operators"
     },
     "onionservices": {
-	"path": "#onion-services",
-	"control": "onion-services",
+	"path": "#onionservices",
+	"control": "onionservices",
 	"label": "Onion স�বা"
     },
     "misc": {
diff --git a/bn_IN.json b/bn_IN.json
index 7b9006505..63a46e0ca 100644
--- a/bn_IN.json
+++ b/bn_IN.json
@@ -5,18 +5,18 @@
 	"label": "Most Frequently Asked Questions"
     },
     "tbb": {
-	"path": "#tor-browser",
-	"control": "tor-browser",
+	"path": "#tbb",
+	"control": "tbb",
 	"label": "Tor Browser"
     },
     "tormessenger": {
-	"path": "#tor-messenger",
-	"control": "tor-messenger",
+	"path": "#tormessenger",
+	"control": "tormessenger",
 	"label": "Tor Messenger"
     },
     "tormobile": {
-	"path": "#tor-mobile",
-	"control": "tor-mobile",
+	"path": "#tormobile",
+	"control": "tormobile",
 	"label": "Tor Mobile"
     },
     "gettor": {
@@ -25,8 +25,8 @@
 	"label": "GetTor"
     },
     "connecting": {
-	"path": "#connecting-to-tor",
-	"control": "connecting-to-tor",
+	"path": "#connectingtotor",
+	"control": "connectingtotor",
 	"label": "Connecting To Tor"
     },
     "censorship": {
@@ -45,8 +45,8 @@
 	"label": "Operators"
     },
     "onionservices": {
-	"path": "#onion-services",
-	"control": "onion-services",
+	"path": "#onionservices",
+	"control": "onionservices",
 	"label": "Onion Services"
     },
     "misc": {
diff --git a/bo.json b/bo.json
index 09213dd5b..145c3254e 100644
--- a/bo.json
+++ b/bo.json
@@ -5,18 +5,18 @@
 	"label": "Most Frequently Asked Questions"
     },
     "tbb": {
-	"path": "#tor-browser",
-	"control": "tor-browser",
+	"path": "#tbb",
+	"control": "tbb",
 	"label": "Tor Browser"
     },
     "tormessenger": {
-	"path": "#tor-messenger",
-	"control": "tor-messenger",
+	"path": "#tormessenger",
+	"control": "tormessenger",
 	"label": "Tor Messenger"
     },
     "tormobile": {
-	"path": "#tor-mobile",
-	"control": "tor-mobile",
+	"path": "#tormobile",
+	"control": "tormobile",
 	"label": "Tor Mobile"
     },
     "gettor": {
@@ -25,8 +25,8 @@
 	"label": "GetTor"
     },
     "connecting": {
-	"path": "#connecting-to-tor",
-	"control": "connecting-to-tor",
+	"path": "#connectingtotor",
+	"control": "connectingtotor",
 	"label": "Connecting To Tor"
     },
     "censorship": {
@@ -45,8 +45,8 @@
 	"label": "Operators"
     },
     "onionservices": {
-	"path": "#onion-services",
-	"control": "onion-services",
+	"path": "#onionservices",
+	"control": "onionservices",
 	"label": "Onion Services"
     },
     "misc": {
diff --git a/br.json b/br.json
index 2ec0eeba6..1406faff9 100644
--- a/br.json
+++ b/br.json
@@ -5,18 +5,18 @@
 	"label": "Most Frequently Asked Questions"
     },
     "tbb": {
-	"path": "#tor-browser",
-	"control": "tor-browser",
+	"path": "#tbb",
+	"control": "tbb",
 	"label": "Keflusker enklask Tor"
     },
     "tormessenger": {
-	"path": "#tor-messenger",
-	"control": "tor-messenger",
+	"path": "#tormessenger",
+	"control": "tormessenger",
 	"label": "Tor Messenger"
     },
     "tormobile": {
-	"path": "#tor-mobile",
-	"control": "tor-mobile",
+	"path": "#tormobile",
+	"control": "tormobile",
 	"label": "Tor Mobile"
     },
     "gettor": {
@@ -25,8 +25,8 @@
 	"label": "GetTor"
     },
     "connecting": {
-	"path": "#connecting-to-tor",
-	"control": "connecting-to-tor",
+	"path": "#connectingtotor",
+	"control": "connectingtotor",
 	"label": "Connecting To Tor"
     },
     "censorship": {
@@ -45,8 +45,8 @@
 	"label": "Operators"
     },
     "onionservices": {
-	"path": "#onion-services",
-	"control": "onion-services",
+	"path": "#onionservices",
+	"control": "onionservices",
 	"label": "Onion Services"
     },
     "misc": {
diff --git a/brx.json b/brx.json
index 7b9006505..63a46e0ca 100644
--- a/brx.json
+++ b/brx.json
@@ -5,18 +5,18 @@
 	"label": "Most Frequently Asked Questions"
     },
     "tbb": {
-	"path": "#tor-browser",
-	"control": "tor-browser",
+	"path": "#tbb",
+	"control": "tbb",
 	"label": "Tor Browser"
     },
     "tormessenger": {
-	"path": "#tor-messenger",
-	"control": "tor-messenger",
+	"path": "#tormessenger",
+	"control": "tormessenger",
 	"label": "Tor Messenger"
     },
     "tormobile": {
-	"path": "#tor-mobile",
-	"control": "tor-mobile",
+	"path": "#tormobile",
+	"control": "tormobile",
 	"label": "Tor Mobile"
     },
     "gettor": {
@@ -25,8 +25,8 @@
 	"label": "GetTor"
     },
     "connecting": {
-	"path": "#connecting-to-tor",
-	"control": "connecting-to-tor",
+	"path": "#connectingtotor",
+	"control": "connectingtotor",
 	"label": "Connecting To Tor"
     },
     "censorship": {
@@ -45,8 +45,8 @@
 	"label": "Operators"
     },
     "onionservices": {
-	"path": "#onion-services",
-	"control": "onion-services",
+	"path": "#onionservices",
+	"control": "onionservices",
 	"label": "Onion Services"
     },
     "misc": {
diff --git a/bs.json b/bs.json
index 7b9006505..63a46e0ca 100644
--- a/bs.json
+++ b/bs.json
@@ -5,18 +5,18 @@
 	"label": "Most Frequently Asked Questions"
     },
     "tbb": {
-	"path": "#tor-browser",
-	"control": "tor-browser",
+	"path": "#tbb",
+	"control": "tbb",
 	"label": "Tor Browser"
     },
     "tormessenger": {
-	"path": "#tor-messenger",
-	"control": "tor-messenger",
+	"path": "#tormessenger",
+	"control": "tormessenger",
 	"label": "Tor Messenger"
     },
     "tormobile": {
-	"path": "#tor-mobile",
-	"control": "tor-mobile",
+	"path": "#tormobile",
+	"control": "tormobile",
 	"label": "Tor Mobile"
     },
     "gettor": {
@@ -25,8 +25,8 @@
 	"label": "GetTor"
     },
     "connecting": {
-	"path": "#connecting-to-tor",
-	"control": "connecting-to-tor",
+	"path": "#connectingtotor",
+	"control": "connectingtotor",
 	"label": "Connecting To Tor"
     },
     "censorship": {
@@ -45,8 +45,8 @@
 	"label": "Operators"
     },
     "onionservices": {
-	"path": "#onion-services",
-	"control": "onion-services",
+	"path": "#onionservices",
+	"control": "onionservices",
 	"label": "Onion Services"
     },
     "misc": {
diff --git a/ca.json b/ca.json
index fee347eb0..5771e3630 100644
--- a/ca.json
+++ b/ca.json
@@ -5,18 +5,18 @@
 	"label": "Preguntes Preguntades Més Frequents"
     },
     "tbb": {
-	"path": "#tor-browser",
-	"control": "tor-browser",
+	"path": "#tbb",
+	"control": "tbb",
 	"label": "Tor Browser"
     },
     "tormessenger": {
-	"path": "#tor-messenger",
-	"control": "tor-messenger",
+	"path": "#tormessenger",
+	"control": "tormessenger",
 	"label": "Tor Messenger"
     },
     "tormobile": {
-	"path": "#tor-mobile",
-	"control": "tor-mobile",
+	"path": "#tormobile",
+	"control": "tormobile",
 	"label": "Tor Mobile"
     },
     "gettor": {
@@ -25,8 +25,8 @@
 	"label": "GetTor"
     },
     "connecting": {
-	"path": "#connecting-to-tor",
-	"control": "connecting-to-tor",
+	"path": "#connectingtotor",
+	"control": "connectingtotor",
 	"label": "Connexió al Tor"
     },
     "censorship": {
@@ -45,8 +45,8 @@
 	"label": "Operadors"
     },
     "onionservices": {
-	"path": "#onion-services",
-	"control": "onion-services",
+	"path": "#onionservices",
+	"control": "onionservices",
 	"label": "Onion Services"
     },
     "misc": {
diff --git a/cs.json b/cs.json
index 65c3d4e42..c6012d6d1 100644
--- a/cs.json
+++ b/cs.json
@@ -5,18 +5,18 @@
 	"label": "Most Frequently Asked Questions"
     },
     "tbb": {
-	"path": "#tor-browser",
-	"control": "tor-browser",
+	"path": "#tbb",
+	"control": "tbb",
 	"label": "Tor ProhlížeÄ?"
     },
     "tormessenger": {
-	"path": "#tor-messenger",
-	"control": "tor-messenger",
+	"path": "#tormessenger",
+	"control": "tormessenger",
 	"label": "Tor Messenger"
     },
     "tormobile": {
-	"path": "#tor-mobile",
-	"control": "tor-mobile",
+	"path": "#tormobile",
+	"control": "tormobile",
 	"label": "Tor Mobile"
     },
     "gettor": {
@@ -25,8 +25,8 @@
 	"label": "GetTor"
     },
     "connecting": {
-	"path": "#connecting-to-tor",
-	"control": "connecting-to-tor",
+	"path": "#connectingtotor",
+	"control": "connectingtotor",
 	"label": "Connecting To Tor"
     },
     "censorship": {
@@ -45,8 +45,8 @@
 	"label": "Operators"
     },
     "onionservices": {
-	"path": "#onion-services",
-	"control": "onion-services",
+	"path": "#onionservices",
+	"control": "onionservices",
 	"label": "Onion Services"
     },
     "misc": {
diff --git a/csb.json b/csb.json
index 7b9006505..63a46e0ca 100644
--- a/csb.json
+++ b/csb.json
@@ -5,18 +5,18 @@
 	"label": "Most Frequently Asked Questions"
     },
     "tbb": {
-	"path": "#tor-browser",
-	"control": "tor-browser",
+	"path": "#tbb",
+	"control": "tbb",
 	"label": "Tor Browser"
     },
     "tormessenger": {
-	"path": "#tor-messenger",
-	"control": "tor-messenger",
+	"path": "#tormessenger",
+	"control": "tormessenger",
 	"label": "Tor Messenger"
     },
     "tormobile": {
-	"path": "#tor-mobile",
-	"control": "tor-mobile",
+	"path": "#tormobile",
+	"control": "tormobile",
 	"label": "Tor Mobile"
     },
     "gettor": {
@@ -25,8 +25,8 @@
 	"label": "GetTor"
     },
     "connecting": {
-	"path": "#connecting-to-tor",
-	"control": "connecting-to-tor",
+	"path": "#connectingtotor",
+	"control": "connectingtotor",
 	"label": "Connecting To Tor"
     },
     "censorship": {
@@ -45,8 +45,8 @@
 	"label": "Operators"
     },
     "onionservices": {
-	"path": "#onion-services",
-	"control": "onion-services",
+	"path": "#onionservices",
+	"control": "onionservices",
 	"label": "Onion Services"
     },
     "misc": {
diff --git a/cv.json b/cv.json
index 7b9006505..63a46e0ca 100644
--- a/cv.json
+++ b/cv.json
@@ -5,18 +5,18 @@
 	"label": "Most Frequently Asked Questions"
     },
     "tbb": {
-	"path": "#tor-browser",
-	"control": "tor-browser",
+	"path": "#tbb",
+	"control": "tbb",
 	"label": "Tor Browser"
     },
     "tormessenger": {
-	"path": "#tor-messenger",
-	"control": "tor-messenger",
+	"path": "#tormessenger",
+	"control": "tormessenger",
 	"label": "Tor Messenger"
     },
     "tormobile": {
-	"path": "#tor-mobile",
-	"control": "tor-mobile",
+	"path": "#tormobile",
+	"control": "tormobile",
 	"label": "Tor Mobile"
     },
     "gettor": {
@@ -25,8 +25,8 @@
 	"label": "GetTor"
     },
     "connecting": {
-	"path": "#connecting-to-tor",
-	"control": "connecting-to-tor",
+	"path": "#connectingtotor",
+	"control": "connectingtotor",
 	"label": "Connecting To Tor"
     },
     "censorship": {
@@ -45,8 +45,8 @@
 	"label": "Operators"
     },
     "onionservices": {
-	"path": "#onion-services",
-	"control": "onion-services",
+	"path": "#onionservices",
+	"control": "onionservices",
 	"label": "Onion Services"
     },
     "misc": {
diff --git a/cy.json b/cy.json
index 3d827a8da..5a4c9a032 100644
--- a/cy.json
+++ b/cy.json
@@ -5,18 +5,18 @@
 	"label": "Most Frequently Asked Questions"
     },
     "tbb": {
-	"path": "#tor-browser",
-	"control": "tor-browser",
+	"path": "#tbb",
+	"control": "tbb",
 	"label": "Porwr Tor"
     },
     "tormessenger": {
-	"path": "#tor-messenger",
-	"control": "tor-messenger",
+	"path": "#tormessenger",
+	"control": "tormessenger",
 	"label": "Tor Messenger"
     },
     "tormobile": {
-	"path": "#tor-mobile",
-	"control": "tor-mobile",
+	"path": "#tormobile",
+	"control": "tormobile",
 	"label": "Tor Mobile"
     },
     "gettor": {
@@ -25,8 +25,8 @@
 	"label": "GetTor"
     },
     "connecting": {
-	"path": "#connecting-to-tor",
-	"control": "connecting-to-tor",
+	"path": "#connectingtotor",
+	"control": "connectingtotor",
 	"label": "Connecting To Tor"
     },
     "censorship": {
@@ -45,8 +45,8 @@
 	"label": "Operators"
     },
     "onionservices": {
-	"path": "#onion-services",
-	"control": "onion-services",
+	"path": "#onionservices",
+	"control": "onionservices",
 	"label": "Onion Services"
     },
     "misc": {
diff --git a/da.json b/da.json
index 74e1969d8..bd776f11d 100644
--- a/da.json
+++ b/da.json
@@ -5,18 +5,18 @@
 	"label": "Most Frequently Asked Questions"
     },
     "tbb": {
-	"path": "#tor-browser",
-	"control": "tor-browser",
+	"path": "#tbb",
+	"control": "tbb",
 	"label": "Tor Browser"
     },
     "tormessenger": {
-	"path": "#tor-messenger",
-	"control": "tor-messenger",
+	"path": "#tormessenger",
+	"control": "tormessenger",
 	"label": "Tor Messenger"
     },
     "tormobile": {
-	"path": "#tor-mobile",
-	"control": "tor-mobile",
+	"path": "#tormobile",
+	"control": "tormobile",
 	"label": "Tor Mobile"
     },
     "gettor": {
@@ -25,8 +25,8 @@
 	"label": "GetTor"
     },
     "connecting": {
-	"path": "#connecting-to-tor",
-	"control": "connecting-to-tor",
+	"path": "#connectingtotor",
+	"control": "connectingtotor",
 	"label": "Connecting To Tor"
     },
     "censorship": {
@@ -45,8 +45,8 @@
 	"label": "Operators"
     },
     "onionservices": {
-	"path": "#onion-services",
-	"control": "onion-services",
+	"path": "#onionservices",
+	"control": "onionservices",
 	"label": "Løg-tjenester"
     },
     "misc": {
diff --git a/de.json b/de.json
index b29b0183b..9f9c0423a 100644
--- a/de.json
+++ b/de.json
@@ -5,18 +5,18 @@
 	"label": "Am häufigsten gestellte Fragen"
     },
     "tbb": {
-	"path": "#tor-browser",
-	"control": "tor-browser",
+	"path": "#tbb",
+	"control": "tbb",
 	"label": "Tor-Browser"
     },
     "tormessenger": {
-	"path": "#tor-messenger",
-	"control": "tor-messenger",
+	"path": "#tormessenger",
+	"control": "tormessenger",
 	"label": "Tor Messenger"
     },
     "tormobile": {
-	"path": "#tor-mobile",
-	"control": "tor-mobile",
+	"path": "#tormobile",
+	"control": "tormobile",
 	"label": "Tor Mobile"
     },
     "gettor": {
@@ -25,8 +25,8 @@
 	"label": "GetTor"
     },
     "connecting": {
-	"path": "#connecting-to-tor",
-	"control": "connecting-to-tor",
+	"path": "#connectingtotor",
+	"control": "connectingtotor",
 	"label": "Connecting To Tor"
     },
     "censorship": {
@@ -45,8 +45,8 @@
 	"label": "Betreiber"
     },
     "onionservices": {
-	"path": "#onion-services",
-	"control": "onion-services",
+	"path": "#onionservices",
+	"control": "onionservices",
 	"label": "Onion-Dienste"
     },
     "misc": {
diff --git a/dz.json b/dz.json
index 7b9006505..63a46e0ca 100644
--- a/dz.json
+++ b/dz.json
@@ -5,18 +5,18 @@
 	"label": "Most Frequently Asked Questions"
     },
     "tbb": {
-	"path": "#tor-browser",
-	"control": "tor-browser",
+	"path": "#tbb",
+	"control": "tbb",
 	"label": "Tor Browser"
     },
     "tormessenger": {
-	"path": "#tor-messenger",
-	"control": "tor-messenger",
+	"path": "#tormessenger",
+	"control": "tormessenger",
 	"label": "Tor Messenger"
     },
     "tormobile": {
-	"path": "#tor-mobile",
-	"control": "tor-mobile",
+	"path": "#tormobile",
+	"control": "tormobile",
 	"label": "Tor Mobile"
     },
     "gettor": {
@@ -25,8 +25,8 @@
 	"label": "GetTor"
     },
     "connecting": {
-	"path": "#connecting-to-tor",
-	"control": "connecting-to-tor",
+	"path": "#connectingtotor",
+	"control": "connectingtotor",
 	"label": "Connecting To Tor"
     },
     "censorship": {
@@ -45,8 +45,8 @@
 	"label": "Operators"
     },
     "onionservices": {
-	"path": "#onion-services",
-	"control": "onion-services",
+	"path": "#onionservices",
+	"control": "onionservices",
 	"label": "Onion Services"
     },
     "misc": {
diff --git a/el.json b/el.json
index 309ad0278..6d1bf7136 100644
--- a/el.json
+++ b/el.json
@@ -5,18 +5,18 @@
 	"label": "Most Frequently Asked Questions"
     },
     "tbb": {
-	"path": "#tor-browser",
-	"control": "tor-browser",
+	"path": "#tbb",
+	"control": "tbb",
 	"label": "Tor Browser"
     },
     "tormessenger": {
-	"path": "#tor-messenger",
-	"control": "tor-messenger",
+	"path": "#tormessenger",
+	"control": "tormessenger",
 	"label": "Tor Messenger"
     },
     "tormobile": {
-	"path": "#tor-mobile",
-	"control": "tor-mobile",
+	"path": "#tormobile",
+	"control": "tormobile",
 	"label": "Tor Mobile"
     },
     "gettor": {
@@ -25,8 +25,8 @@
 	"label": "GetTor"
     },
     "connecting": {
-	"path": "#connecting-to-tor",
-	"control": "connecting-to-tor",
+	"path": "#connectingtotor",
+	"control": "connectingtotor",
 	"label": "Connecting To Tor"
     },
     "censorship": {
@@ -45,8 +45,8 @@
 	"label": "Operators"
     },
     "onionservices": {
-	"path": "#onion-services",
-	"control": "onion-services",
+	"path": "#onionservices",
+	"control": "onionservices",
 	"label": "Î¥Ï?ηÏ?εÏ?ίεÏ? Onion"
     },
     "misc": {
diff --git a/en_GB.json b/en_GB.json
index 7b9006505..63a46e0ca 100644
--- a/en_GB.json
+++ b/en_GB.json
@@ -5,18 +5,18 @@
 	"label": "Most Frequently Asked Questions"
     },
     "tbb": {
-	"path": "#tor-browser",
-	"control": "tor-browser",
+	"path": "#tbb",
+	"control": "tbb",
 	"label": "Tor Browser"
     },
     "tormessenger": {
-	"path": "#tor-messenger",
-	"control": "tor-messenger",
+	"path": "#tormessenger",
+	"control": "tormessenger",
 	"label": "Tor Messenger"
     },
     "tormobile": {
-	"path": "#tor-mobile",
-	"control": "tor-mobile",
+	"path": "#tormobile",
+	"control": "tormobile",
 	"label": "Tor Mobile"
     },
     "gettor": {
@@ -25,8 +25,8 @@
 	"label": "GetTor"
     },
     "connecting": {
-	"path": "#connecting-to-tor",
-	"control": "connecting-to-tor",
+	"path": "#connectingtotor",
+	"control": "connectingtotor",
 	"label": "Connecting To Tor"
     },
     "censorship": {
@@ -45,8 +45,8 @@
 	"label": "Operators"
     },
     "onionservices": {
-	"path": "#onion-services",
-	"control": "onion-services",
+	"path": "#onionservices",
+	"control": "onionservices",
 	"label": "Onion Services"
     },
     "misc": {
diff --git a/eo.json b/eo.json
index d55e59d52..25825bcc0 100644
--- a/eo.json
+++ b/eo.json
@@ -5,18 +5,18 @@
 	"label": "Most Frequently Asked Questions"
     },
     "tbb": {
-	"path": "#tor-browser",
-	"control": "tor-browser",
+	"path": "#tbb",
+	"control": "tbb",
 	"label": "Tor krozilo"
     },
     "tormessenger": {
-	"path": "#tor-messenger",
-	"control": "tor-messenger",
+	"path": "#tormessenger",
+	"control": "tormessenger",
 	"label": "Tor Messenger"
     },
     "tormobile": {
-	"path": "#tor-mobile",
-	"control": "tor-mobile",
+	"path": "#tormobile",
+	"control": "tormobile",
 	"label": "Tor Mobile"
     },
     "gettor": {
@@ -25,8 +25,8 @@
 	"label": "GetTor"
     },
     "connecting": {
-	"path": "#connecting-to-tor",
-	"control": "connecting-to-tor",
+	"path": "#connectingtotor",
+	"control": "connectingtotor",
 	"label": "Connecting To Tor"
     },
     "censorship": {
@@ -45,8 +45,8 @@
 	"label": "Operators"
     },
     "onionservices": {
-	"path": "#onion-services",
-	"control": "onion-services",
+	"path": "#onionservices",
+	"control": "onionservices",
 	"label": "Onion Services"
     },
     "misc": {
diff --git a/es.json b/es.json
index 3b2ad71b7..37f95470e 100644
--- a/es.json
+++ b/es.json
@@ -5,18 +5,18 @@
 	"label": "Preguntas más frecuentes"
     },
     "tbb": {
-	"path": "#tor-browser",
-	"control": "tor-browser",
+	"path": "#tbb",
+	"control": "tbb",
 	"label": "Navegador Tor"
     },
     "tormessenger": {
-	"path": "#tor-messenger",
-	"control": "tor-messenger",
+	"path": "#tormessenger",
+	"control": "tormessenger",
 	"label": "Tor Messenger"
     },
     "tormobile": {
-	"path": "#tor-mobile",
-	"control": "tor-mobile",
+	"path": "#tormobile",
+	"control": "tormobile",
 	"label": "Tor Mobile"
     },
     "gettor": {
@@ -25,8 +25,8 @@
 	"label": "GetTor"
     },
     "connecting": {
-	"path": "#connecting-to-tor",
-	"control": "connecting-to-tor",
+	"path": "#connectingtotor",
+	"control": "connectingtotor",
 	"label": "Conectar a Tor"
     },
     "censorship": {
@@ -45,8 +45,8 @@
 	"label": "Operadores"
     },
     "onionservices": {
-	"path": "#onion-services",
-	"control": "onion-services",
+	"path": "#onionservices",
+	"control": "onionservices",
 	"label": "Servicios onion"
     },
     "misc": {
diff --git a/es_AR.json b/es_AR.json
index 4e87269f0..d77606670 100644
--- a/es_AR.json
+++ b/es_AR.json
@@ -5,18 +5,18 @@
 	"label": "Most Frequently Asked Questions"
     },
     "tbb": {
-	"path": "#tor-browser",
-	"control": "tor-browser",
+	"path": "#tbb",
+	"control": "tbb",
 	"label": "Buscador Tor"
     },
     "tormessenger": {
-	"path": "#tor-messenger",
-	"control": "tor-messenger",
+	"path": "#tormessenger",
+	"control": "tormessenger",
 	"label": "Tor Messenger"
     },
     "tormobile": {
-	"path": "#tor-mobile",
-	"control": "tor-mobile",
+	"path": "#tormobile",
+	"control": "tormobile",
 	"label": "Tor Mobile"
     },
     "gettor": {
@@ -25,8 +25,8 @@
 	"label": "GetTor"
     },
     "connecting": {
-	"path": "#connecting-to-tor",
-	"control": "connecting-to-tor",
+	"path": "#connectingtotor",
+	"control": "connectingtotor",
 	"label": "Connecting To Tor"
     },
     "censorship": {
@@ -45,8 +45,8 @@
 	"label": "Operators"
     },
     "onionservices": {
-	"path": "#onion-services",
-	"control": "onion-services",
+	"path": "#onionservices",
+	"control": "onionservices",
 	"label": "Onion Services"
     },
     "misc": {
diff --git a/es_CL.json b/es_CL.json
index d669b26c1..6f3a6161d 100644
--- a/es_CL.json
+++ b/es_CL.json
@@ -5,18 +5,18 @@
 	"label": "Most Frequently Asked Questions"
     },
     "tbb": {
-	"path": "#tor-browser",
-	"control": "tor-browser",
+	"path": "#tbb",
+	"control": "tbb",
 	"label": "Explorador Tor"
     },
     "tormessenger": {
-	"path": "#tor-messenger",
-	"control": "tor-messenger",
+	"path": "#tormessenger",
+	"control": "tormessenger",
 	"label": "Tor Messenger"
     },
     "tormobile": {
-	"path": "#tor-mobile",
-	"control": "tor-mobile",
+	"path": "#tormobile",
+	"control": "tormobile",
 	"label": "Tor Mobile"
     },
     "gettor": {
@@ -25,8 +25,8 @@
 	"label": "GetTor"
     },
     "connecting": {
-	"path": "#connecting-to-tor",
-	"control": "connecting-to-tor",
+	"path": "#connectingtotor",
+	"control": "connectingtotor",
 	"label": "Connecting To Tor"
     },
     "censorship": {
@@ -45,8 +45,8 @@
 	"label": "Operators"
     },
     "onionservices": {
-	"path": "#onion-services",
-	"control": "onion-services",
+	"path": "#onionservices",
+	"control": "onionservices",
 	"label": "Onion Services"
     },
     "misc": {
diff --git a/es_CO.json b/es_CO.json
index 013583f88..0bcfc1fae 100644
--- a/es_CO.json
+++ b/es_CO.json
@@ -5,18 +5,18 @@
 	"label": "Most Frequently Asked Questions"
     },
     "tbb": {
-	"path": "#tor-browser",
-	"control": "tor-browser",
+	"path": "#tbb",
+	"control": "tbb",
 	"label": "Navegador Tor"
     },
     "tormessenger": {
-	"path": "#tor-messenger",
-	"control": "tor-messenger",
+	"path": "#tormessenger",
+	"control": "tormessenger",
 	"label": "Tor Messenger"
     },
     "tormobile": {
-	"path": "#tor-mobile",
-	"control": "tor-mobile",
+	"path": "#tormobile",
+	"control": "tormobile",
 	"label": "Tor Mobile"
     },
     "gettor": {
@@ -25,8 +25,8 @@
 	"label": "GetTor"
     },
     "connecting": {
-	"path": "#connecting-to-tor",
-	"control": "connecting-to-tor",
+	"path": "#connectingtotor",
+	"control": "connectingtotor",
 	"label": "Connecting To Tor"
     },
     "censorship": {
@@ -45,8 +45,8 @@
 	"label": "Operators"
     },
     "onionservices": {
-	"path": "#onion-services",
-	"control": "onion-services",
+	"path": "#onionservices",
+	"control": "onionservices",
 	"label": "Onion Services"
     },
     "misc": {
diff --git a/es_MX.json b/es_MX.json
index 2467c097c..5d6e56e72 100644
--- a/es_MX.json
+++ b/es_MX.json
@@ -5,18 +5,18 @@
 	"label": "Most Frequently Asked Questions"
     },
     "tbb": {
-	"path": "#tor-browser",
-	"control": "tor-browser",
+	"path": "#tbb",
+	"control": "tbb",
 	"label": "Explorador de Tor"
     },
     "tormessenger": {
-	"path": "#tor-messenger",
-	"control": "tor-messenger",
+	"path": "#tormessenger",
+	"control": "tormessenger",
 	"label": "Tor Messenger"
     },
     "tormobile": {
-	"path": "#tor-mobile",
-	"control": "tor-mobile",
+	"path": "#tormobile",
+	"control": "tormobile",
 	"label": "Tor Mobile"
     },
     "gettor": {
@@ -25,8 +25,8 @@
 	"label": "GetTor"
     },
     "connecting": {
-	"path": "#connecting-to-tor",
-	"control": "connecting-to-tor",
+	"path": "#connectingtotor",
+	"control": "connectingtotor",
 	"label": "Connecting To Tor"
     },
     "censorship": {
@@ -45,8 +45,8 @@
 	"label": "Operators"
     },
     "onionservices": {
-	"path": "#onion-services",
-	"control": "onion-services",
+	"path": "#onionservices",
+	"control": "onionservices",
 	"label": "Onion Services"
     },
     "misc": {
diff --git a/et.json b/et.json
index 0fd403423..eb2fbb6fb 100644
--- a/et.json
+++ b/et.json
@@ -5,18 +5,18 @@
 	"label": "Most Frequently Asked Questions"
     },
     "tbb": {
-	"path": "#tor-browser",
-	"control": "tor-browser",
+	"path": "#tbb",
+	"control": "tbb",
 	"label": "Tor Brauser"
     },
     "tormessenger": {
-	"path": "#tor-messenger",
-	"control": "tor-messenger",
+	"path": "#tormessenger",
+	"control": "tormessenger",
 	"label": "Tor Messenger"
     },
     "tormobile": {
-	"path": "#tor-mobile",
-	"control": "tor-mobile",
+	"path": "#tormobile",
+	"control": "tormobile",
 	"label": "Tor Mobile"
     },
     "gettor": {
@@ -25,8 +25,8 @@
 	"label": "GetTor"
     },
     "connecting": {
-	"path": "#connecting-to-tor",
-	"control": "connecting-to-tor",
+	"path": "#connectingtotor",
+	"control": "connectingtotor",
 	"label": "Connecting To Tor"
     },
     "censorship": {
@@ -45,8 +45,8 @@
 	"label": "Operators"
     },
     "onionservices": {
-	"path": "#onion-services",
-	"control": "onion-services",
+	"path": "#onionservices",
+	"control": "onionservices",
 	"label": "Onion Services"
     },
     "misc": {
diff --git a/eu.json b/eu.json
index 7b9006505..63a46e0ca 100644
--- a/eu.json
+++ b/eu.json
@@ -5,18 +5,18 @@
 	"label": "Most Frequently Asked Questions"
     },
     "tbb": {
-	"path": "#tor-browser",
-	"control": "tor-browser",
+	"path": "#tbb",
+	"control": "tbb",
 	"label": "Tor Browser"
     },
     "tormessenger": {
-	"path": "#tor-messenger",
-	"control": "tor-messenger",
+	"path": "#tormessenger",
+	"control": "tormessenger",
 	"label": "Tor Messenger"
     },
     "tormobile": {
-	"path": "#tor-mobile",
-	"control": "tor-mobile",
+	"path": "#tormobile",
+	"control": "tormobile",
 	"label": "Tor Mobile"
     },
     "gettor": {
@@ -25,8 +25,8 @@
 	"label": "GetTor"
     },
     "connecting": {
-	"path": "#connecting-to-tor",
-	"control": "connecting-to-tor",
+	"path": "#connectingtotor",
+	"control": "connectingtotor",
 	"label": "Connecting To Tor"
     },
     "censorship": {
@@ -45,8 +45,8 @@
 	"label": "Operators"
     },
     "onionservices": {
-	"path": "#onion-services",
-	"control": "onion-services",
+	"path": "#onionservices",
+	"control": "onionservices",
 	"label": "Onion Services"
     },
     "misc": {
diff --git a/fa.json b/fa.json
index 3cbd7e90d..8b56fef13 100644
--- a/fa.json
+++ b/fa.json
@@ -5,18 +5,18 @@
 	"label": "Most Frequently Asked Questions"
     },
     "tbb": {
-	"path": "#tor-browser",
-	"control": "tor-browser",
+	"path": "#tbb",
+	"control": "tbb",
 	"label": "Ù?رÙ?رگر تÙ?ر"
     },
     "tormessenger": {
-	"path": "#tor-messenger",
-	"control": "tor-messenger",
+	"path": "#tormessenger",
+	"control": "tormessenger",
 	"label": "Tor Messenger"
     },
     "tormobile": {
-	"path": "#tor-mobile",
-	"control": "tor-mobile",
+	"path": "#tormobile",
+	"control": "tormobile",
 	"label": "Tor Mobile"
     },
     "gettor": {
@@ -25,8 +25,8 @@
 	"label": "GetTor"
     },
     "connecting": {
-	"path": "#connecting-to-tor",
-	"control": "connecting-to-tor",
+	"path": "#connectingtotor",
+	"control": "connectingtotor",
 	"label": "Connecting To Tor"
     },
     "censorship": {
@@ -45,8 +45,8 @@
 	"label": "Operators"
     },
     "onionservices": {
-	"path": "#onion-services",
-	"control": "onion-services",
+	"path": "#onionservices",
+	"control": "onionservices",
 	"label": "خدÙ?ات Ù¾Û?از"
     },
     "misc": {
diff --git a/fi.json b/fi.json
index 0081c775f..d22a0de26 100644
--- a/fi.json
+++ b/fi.json
@@ -5,18 +5,18 @@
 	"label": "Most Frequently Asked Questions"
     },
     "tbb": {
-	"path": "#tor-browser",
-	"control": "tor-browser",
+	"path": "#tbb",
+	"control": "tbb",
 	"label": "Tor-selain"
     },
     "tormessenger": {
-	"path": "#tor-messenger",
-	"control": "tor-messenger",
+	"path": "#tormessenger",
+	"control": "tormessenger",
 	"label": "Tor Messenger"
     },
     "tormobile": {
-	"path": "#tor-mobile",
-	"control": "tor-mobile",
+	"path": "#tormobile",
+	"control": "tormobile",
 	"label": "Tor Mobile"
     },
     "gettor": {
@@ -25,8 +25,8 @@
 	"label": "GetTor"
     },
     "connecting": {
-	"path": "#connecting-to-tor",
-	"control": "connecting-to-tor",
+	"path": "#connectingtotor",
+	"control": "connectingtotor",
 	"label": "Connecting To Tor"
     },
     "censorship": {
@@ -45,8 +45,8 @@
 	"label": "Operators"
     },
     "onionservices": {
-	"path": "#onion-services",
-	"control": "onion-services",
+	"path": "#onionservices",
+	"control": "onionservices",
 	"label": "Onion Services"
     },
     "misc": {
diff --git a/fil.json b/fil.json
index 7b9006505..63a46e0ca 100644
--- a/fil.json
+++ b/fil.json
@@ -5,18 +5,18 @@
 	"label": "Most Frequently Asked Questions"
     },
     "tbb": {
-	"path": "#tor-browser",
-	"control": "tor-browser",
+	"path": "#tbb",
+	"control": "tbb",
 	"label": "Tor Browser"
     },
     "tormessenger": {
-	"path": "#tor-messenger",
-	"control": "tor-messenger",
+	"path": "#tormessenger",
+	"control": "tormessenger",
 	"label": "Tor Messenger"
     },
     "tormobile": {
-	"path": "#tor-mobile",
-	"control": "tor-mobile",
+	"path": "#tormobile",
+	"control": "tormobile",
 	"label": "Tor Mobile"
     },
     "gettor": {
@@ -25,8 +25,8 @@
 	"label": "GetTor"
     },
     "connecting": {
-	"path": "#connecting-to-tor",
-	"control": "connecting-to-tor",
+	"path": "#connectingtotor",
+	"control": "connectingtotor",
 	"label": "Connecting To Tor"
     },
     "censorship": {
@@ -45,8 +45,8 @@
 	"label": "Operators"
     },
     "onionservices": {
-	"path": "#onion-services",
-	"control": "onion-services",
+	"path": "#onionservices",
+	"control": "onionservices",
 	"label": "Onion Services"
     },
     "misc": {
diff --git a/fo.json b/fo.json
index 7b9006505..63a46e0ca 100644
--- a/fo.json
+++ b/fo.json
@@ -5,18 +5,18 @@
 	"label": "Most Frequently Asked Questions"
     },
     "tbb": {
-	"path": "#tor-browser",
-	"control": "tor-browser",
+	"path": "#tbb",
+	"control": "tbb",
 	"label": "Tor Browser"
     },
     "tormessenger": {
-	"path": "#tor-messenger",
-	"control": "tor-messenger",
+	"path": "#tormessenger",
+	"control": "tormessenger",
 	"label": "Tor Messenger"
     },
     "tormobile": {
-	"path": "#tor-mobile",
-	"control": "tor-mobile",
+	"path": "#tormobile",
+	"control": "tormobile",
 	"label": "Tor Mobile"
     },
     "gettor": {
@@ -25,8 +25,8 @@
 	"label": "GetTor"
     },
     "connecting": {
-	"path": "#connecting-to-tor",
-	"control": "connecting-to-tor",
+	"path": "#connectingtotor",
+	"control": "connectingtotor",
 	"label": "Connecting To Tor"
     },
     "censorship": {
@@ -45,8 +45,8 @@
 	"label": "Operators"
     },
     "onionservices": {
-	"path": "#onion-services",
-	"control": "onion-services",
+	"path": "#onionservices",
+	"control": "onionservices",
 	"label": "Onion Services"
     },
     "misc": {
diff --git a/fr.json b/fr.json
index d388f4b61..57332188f 100644
--- a/fr.json
+++ b/fr.json
@@ -5,18 +5,18 @@
 	"label": "Questions les plus fréquentes"
     },
     "tbb": {
-	"path": "#navigateur-tor",
-	"control": "navigateur-tor",
+	"path": "#tbb",
+	"control": "tbb",
 	"label": "Le Navigateur Tor"
     },
     "tormessenger": {
-	"path": "#messager-tor",
-	"control": "tor-messenger",
+	"path": "#tormessenger",
+	"control": "tormessenger",
 	"label": "Le messager Tor"
     },
     "tormobile": {
-	"path": "#tor-mobile",
-	"control": "tor-mobile",
+	"path": "#tormobile",
+	"control": "tormobile",
 	"label": "Tor Mobile"
     },
     "gettor": {
@@ -25,8 +25,8 @@
 	"label": "GetTor"
     },
     "connecting": {
-	"path": "#connexion-à-tor",
-	"control": "connexion-à-tor",
+	"path": "#connectingtotor",
+	"control": "connectingtotor",
 	"label": "Connexion à Tor"
     },
     "censorship": {
@@ -45,8 +45,8 @@
 	"label": "Opérateurs"
     },
     "onionservices": {
-	"path": "#services-oignon",
-	"control": "services-oignon",
+	"path": "#onionservices",
+	"control": "onionservices",
 	"label": "Les services oignon"
     },
     "misc": {
diff --git a/fr_CA.json b/fr_CA.json
index 48743287e..bf436f141 100644
--- a/fr_CA.json
+++ b/fr_CA.json
@@ -5,18 +5,18 @@
 	"label": "Most Frequently Asked Questions"
     },
     "tbb": {
-	"path": "#tor-browser",
-	"control": "tor-browser",
+	"path": "#tbb",
+	"control": "tbb",
 	"label": "Navigateur Tor"
     },
     "tormessenger": {
-	"path": "#tor-messenger",
-	"control": "tor-messenger",
+	"path": "#tormessenger",
+	"control": "tormessenger",
 	"label": "Tor Messenger"
     },
     "tormobile": {
-	"path": "#tor-mobile",
-	"control": "tor-mobile",
+	"path": "#tormobile",
+	"control": "tormobile",
 	"label": "Tor Mobile"
     },
     "gettor": {
@@ -25,8 +25,8 @@
 	"label": "GetTor"
     },
     "connecting": {
-	"path": "#connecting-to-tor",
-	"control": "connecting-to-tor",
+	"path": "#connectingtotor",
+	"control": "connectingtotor",
 	"label": "Connecting To Tor"
     },
     "censorship": {
@@ -45,8 +45,8 @@
 	"label": "Operators"
     },
     "onionservices": {
-	"path": "#onion-services",
-	"control": "onion-services",
+	"path": "#onionservices",
+	"control": "onionservices",
 	"label": "Les services oignon"
     },
     "misc": {
diff --git a/fur.json b/fur.json
index 7b9006505..63a46e0ca 100644
--- a/fur.json
+++ b/fur.json
@@ -5,18 +5,18 @@
 	"label": "Most Frequently Asked Questions"
     },
     "tbb": {
-	"path": "#tor-browser",
-	"control": "tor-browser",
+	"path": "#tbb",
+	"control": "tbb",
 	"label": "Tor Browser"
     },
     "tormessenger": {
-	"path": "#tor-messenger",
-	"control": "tor-messenger",
+	"path": "#tormessenger",
+	"control": "tormessenger",
 	"label": "Tor Messenger"
     },
     "tormobile": {
-	"path": "#tor-mobile",
-	"control": "tor-mobile",
+	"path": "#tormobile",
+	"control": "tormobile",
 	"label": "Tor Mobile"
     },
     "gettor": {
@@ -25,8 +25,8 @@
 	"label": "GetTor"
     },
     "connecting": {
-	"path": "#connecting-to-tor",
-	"control": "connecting-to-tor",
+	"path": "#connectingtotor",
+	"control": "connectingtotor",
 	"label": "Connecting To Tor"
     },
     "censorship": {
@@ -45,8 +45,8 @@
 	"label": "Operators"
     },
     "onionservices": {
-	"path": "#onion-services",
-	"control": "onion-services",
+	"path": "#onionservices",
+	"control": "onionservices",
 	"label": "Onion Services"
     },
     "misc": {
diff --git a/fy.json b/fy.json
index 1a8509e21..4c96a1552 100644
--- a/fy.json
+++ b/fy.json
@@ -5,18 +5,18 @@
 	"label": "Most Frequently Asked Questions"
     },
     "tbb": {
-	"path": "#tor-browser",
-	"control": "tor-browser",
+	"path": "#tbb",
+	"control": "tbb",
 	"label": "Tor-browser"
     },
     "tormessenger": {
-	"path": "#tor-messenger",
-	"control": "tor-messenger",
+	"path": "#tormessenger",
+	"control": "tormessenger",
 	"label": "Tor Messenger"
     },
     "tormobile": {
-	"path": "#tor-mobile",
-	"control": "tor-mobile",
+	"path": "#tormobile",
+	"control": "tormobile",
 	"label": "Tor Mobile"
     },
     "gettor": {
@@ -25,8 +25,8 @@
 	"label": "GetTor"
     },
     "connecting": {
-	"path": "#connecting-to-tor",
-	"control": "connecting-to-tor",
+	"path": "#connectingtotor",
+	"control": "connectingtotor",
 	"label": "Connecting To Tor"
     },
     "censorship": {
@@ -45,8 +45,8 @@
 	"label": "Operators"
     },
     "onionservices": {
-	"path": "#onion-services",
-	"control": "onion-services",
+	"path": "#onionservices",
+	"control": "onionservices",
 	"label": "Onion Services"
     },
     "misc": {
diff --git a/ga.json b/ga.json
index 41f41bb04..08265c1d2 100644
--- a/ga.json
+++ b/ga.json
@@ -5,18 +5,18 @@
 	"label": "Ceisteanna Is Coitianta"
     },
     "tbb": {
-	"path": "#tor-browser",
-	"control": "tor-browser",
+	"path": "#tbb",
+	"control": "tbb",
 	"label": "Brabhsálaí Tor"
     },
     "tormessenger": {
-	"path": "#tor-messenger",
-	"control": "tor-messenger",
+	"path": "#tormessenger",
+	"control": "tormessenger",
 	"label": "Tor Messenger"
     },
     "tormobile": {
-	"path": "#tor-mobile",
-	"control": "tor-mobile",
+	"path": "#tormobile",
+	"control": "tormobile",
 	"label": "Tor Soghluaiste"
     },
     "gettor": {
@@ -25,8 +25,8 @@
 	"label": "GetTor"
     },
     "connecting": {
-	"path": "#connecting-to-tor",
-	"control": "connecting-to-tor",
+	"path": "#connectingtotor",
+	"control": "connectingtotor",
 	"label": "Ag Ceangal le Tor"
     },
     "censorship": {
@@ -45,8 +45,8 @@
 	"label": "Oibreoirí"
     },
     "onionservices": {
-	"path": "#onion-services",
-	"control": "onion-services",
+	"path": "#onionservices",
+	"control": "onionservices",
 	"label": "Seirbhísí Onion"
     },
     "misc": {
diff --git a/gd.json b/gd.json
index 7b9006505..63a46e0ca 100644
--- a/gd.json
+++ b/gd.json
@@ -5,18 +5,18 @@
 	"label": "Most Frequently Asked Questions"
     },
     "tbb": {
-	"path": "#tor-browser",
-	"control": "tor-browser",
+	"path": "#tbb",
+	"control": "tbb",
 	"label": "Tor Browser"
     },
     "tormessenger": {
-	"path": "#tor-messenger",
-	"control": "tor-messenger",
+	"path": "#tormessenger",
+	"control": "tormessenger",
 	"label": "Tor Messenger"
     },
     "tormobile": {
-	"path": "#tor-mobile",
-	"control": "tor-mobile",
+	"path": "#tormobile",
+	"control": "tormobile",
 	"label": "Tor Mobile"
     },
     "gettor": {
@@ -25,8 +25,8 @@
 	"label": "GetTor"
     },
     "connecting": {
-	"path": "#connecting-to-tor",
-	"control": "connecting-to-tor",
+	"path": "#connectingtotor",
+	"control": "connectingtotor",
 	"label": "Connecting To Tor"
     },
     "censorship": {
@@ -45,8 +45,8 @@
 	"label": "Operators"
     },
     "onionservices": {
-	"path": "#onion-services",
-	"control": "onion-services",
+	"path": "#onionservices",
+	"control": "onionservices",
 	"label": "Onion Services"
     },
     "misc": {
diff --git a/gl.json b/gl.json
index 7b9006505..63a46e0ca 100644
--- a/gl.json
+++ b/gl.json
@@ -5,18 +5,18 @@
 	"label": "Most Frequently Asked Questions"
     },
     "tbb": {
-	"path": "#tor-browser",
-	"control": "tor-browser",
+	"path": "#tbb",
+	"control": "tbb",
 	"label": "Tor Browser"
     },
     "tormessenger": {
-	"path": "#tor-messenger",
-	"control": "tor-messenger",
+	"path": "#tormessenger",
+	"control": "tormessenger",
 	"label": "Tor Messenger"
     },
     "tormobile": {
-	"path": "#tor-mobile",
-	"control": "tor-mobile",
+	"path": "#tormobile",
+	"control": "tormobile",
 	"label": "Tor Mobile"
     },
     "gettor": {
@@ -25,8 +25,8 @@
 	"label": "GetTor"
     },
     "connecting": {
-	"path": "#connecting-to-tor",
-	"control": "connecting-to-tor",
+	"path": "#connectingtotor",
+	"control": "connectingtotor",
 	"label": "Connecting To Tor"
     },
     "censorship": {
@@ -45,8 +45,8 @@
 	"label": "Operators"
     },
     "onionservices": {
-	"path": "#onion-services",
-	"control": "onion-services",
+	"path": "#onionservices",
+	"control": "onionservices",
 	"label": "Onion Services"
     },
     "misc": {
diff --git a/gu.json b/gu.json
index 7b9006505..63a46e0ca 100644
--- a/gu.json
+++ b/gu.json
@@ -5,18 +5,18 @@
 	"label": "Most Frequently Asked Questions"
     },
     "tbb": {
-	"path": "#tor-browser",
-	"control": "tor-browser",
+	"path": "#tbb",
+	"control": "tbb",
 	"label": "Tor Browser"
     },
     "tormessenger": {
-	"path": "#tor-messenger",
-	"control": "tor-messenger",
+	"path": "#tormessenger",
+	"control": "tormessenger",
 	"label": "Tor Messenger"
     },
     "tormobile": {
-	"path": "#tor-mobile",
-	"control": "tor-mobile",
+	"path": "#tormobile",
+	"control": "tormobile",
 	"label": "Tor Mobile"
     },
     "gettor": {
@@ -25,8 +25,8 @@
 	"label": "GetTor"
     },
     "connecting": {
-	"path": "#connecting-to-tor",
-	"control": "connecting-to-tor",
+	"path": "#connectingtotor",
+	"control": "connectingtotor",
 	"label": "Connecting To Tor"
     },
     "censorship": {
@@ -45,8 +45,8 @@
 	"label": "Operators"
     },
     "onionservices": {
-	"path": "#onion-services",
-	"control": "onion-services",
+	"path": "#onionservices",
+	"control": "onionservices",
 	"label": "Onion Services"
     },
     "misc": {
diff --git a/gu_IN.json b/gu_IN.json
index 7b9006505..63a46e0ca 100644
--- a/gu_IN.json
+++ b/gu_IN.json
@@ -5,18 +5,18 @@
 	"label": "Most Frequently Asked Questions"
     },
     "tbb": {
-	"path": "#tor-browser",
-	"control": "tor-browser",
+	"path": "#tbb",
+	"control": "tbb",
 	"label": "Tor Browser"
     },
     "tormessenger": {
-	"path": "#tor-messenger",
-	"control": "tor-messenger",
+	"path": "#tormessenger",
+	"control": "tormessenger",
 	"label": "Tor Messenger"
     },
     "tormobile": {
-	"path": "#tor-mobile",
-	"control": "tor-mobile",
+	"path": "#tormobile",
+	"control": "tormobile",
 	"label": "Tor Mobile"
     },
     "gettor": {
@@ -25,8 +25,8 @@
 	"label": "GetTor"
     },
     "connecting": {
-	"path": "#connecting-to-tor",
-	"control": "connecting-to-tor",
+	"path": "#connectingtotor",
+	"control": "connectingtotor",
 	"label": "Connecting To Tor"
     },
     "censorship": {
@@ -45,8 +45,8 @@
 	"label": "Operators"
     },
     "onionservices": {
-	"path": "#onion-services",
-	"control": "onion-services",
+	"path": "#onionservices",
+	"control": "onionservices",
 	"label": "Onion Services"
     },
     "misc": {
diff --git a/gun.json b/gun.json
index 7b9006505..63a46e0ca 100644
--- a/gun.json
+++ b/gun.json
@@ -5,18 +5,18 @@
 	"label": "Most Frequently Asked Questions"
     },
     "tbb": {
-	"path": "#tor-browser",
-	"control": "tor-browser",
+	"path": "#tbb",
+	"control": "tbb",
 	"label": "Tor Browser"
     },
     "tormessenger": {
-	"path": "#tor-messenger",
-	"control": "tor-messenger",
+	"path": "#tormessenger",
+	"control": "tormessenger",
 	"label": "Tor Messenger"
     },
     "tormobile": {
-	"path": "#tor-mobile",
-	"control": "tor-mobile",
+	"path": "#tormobile",
+	"control": "tormobile",
 	"label": "Tor Mobile"
     },
     "gettor": {
@@ -25,8 +25,8 @@
 	"label": "GetTor"
     },
     "connecting": {
-	"path": "#connecting-to-tor",
-	"control": "connecting-to-tor",
+	"path": "#connectingtotor",
+	"control": "connectingtotor",
 	"label": "Connecting To Tor"
     },
     "censorship": {
@@ -45,8 +45,8 @@
 	"label": "Operators"
     },
     "onionservices": {
-	"path": "#onion-services",
-	"control": "onion-services",
+	"path": "#onionservices",
+	"control": "onionservices",
 	"label": "Onion Services"
     },
     "misc": {
diff --git a/ha.json b/ha.json
index 7b9006505..63a46e0ca 100644
--- a/ha.json
+++ b/ha.json
@@ -5,18 +5,18 @@
 	"label": "Most Frequently Asked Questions"
     },
     "tbb": {
-	"path": "#tor-browser",
-	"control": "tor-browser",
+	"path": "#tbb",
+	"control": "tbb",
 	"label": "Tor Browser"
     },
     "tormessenger": {
-	"path": "#tor-messenger",
-	"control": "tor-messenger",
+	"path": "#tormessenger",
+	"control": "tormessenger",
 	"label": "Tor Messenger"
     },
     "tormobile": {
-	"path": "#tor-mobile",
-	"control": "tor-mobile",
+	"path": "#tormobile",
+	"control": "tormobile",
 	"label": "Tor Mobile"
     },
     "gettor": {
@@ -25,8 +25,8 @@
 	"label": "GetTor"
     },
     "connecting": {
-	"path": "#connecting-to-tor",
-	"control": "connecting-to-tor",
+	"path": "#connectingtotor",
+	"control": "connectingtotor",
 	"label": "Connecting To Tor"
     },
     "censorship": {
@@ -45,8 +45,8 @@
 	"label": "Operators"
     },
     "onionservices": {
-	"path": "#onion-services",
-	"control": "onion-services",
+	"path": "#onionservices",
+	"control": "onionservices",
 	"label": "Onion Services"
     },
     "misc": {
diff --git a/he.json b/he.json
index 3842ff2cd..7df8b0e30 100644
--- a/he.json
+++ b/he.json
@@ -5,18 +5,18 @@
 	"label": "×?ש×?×?×?ת ×?נפ×?צ×?ת ×?×?×?תר"
     },
     "tbb": {
-	"path": "#tor-browser",
-	"control": "×?פ×?פ×?Ö¾tor",
+	"path": "#tbb",
+	"control": "tbb",
 	"label": "×?פ×?פ×? Tor"
     },
     "tormessenger": {
-	"path": "#tor-messenger",
-	"control": "ש×?×?×?Ö¾tor",
+	"path": "#tormessenger",
+	"control": "tormessenger",
 	"label": "ש×?×?×? Tor"
     },
     "tormobile": {
-	"path": "#tor-mobile",
-	"control": "torÖ¾× ×?×?×?",
+	"path": "#tormobile",
+	"control": "tormobile",
 	"label": "Tor × ×?×?×?"
     },
     "gettor": {
@@ -25,8 +25,8 @@
 	"label": "GetTor"
     },
     "connecting": {
-	"path": "#connecting-to-tor",
-	"control": "×?ת×?×?ר×?ת־×?×?Ö¾tor",
+	"path": "#connectingtotor",
+	"control": "connectingtotor",
 	"label": "×?ת×?×?ר×?ת ×?×? Tor"
     },
     "censorship": {
@@ -45,8 +45,8 @@
 	"label": "×?תפע×?×?×?"
     },
     "onionservices": {
-	"path": "#onion-services",
-	"control": "ש×?ר×?ת×?Ö¾×?צ×?",
+	"path": "#onionservices",
+	"control": "onionservices",
 	"label": "ש×?ר×?ת×? ×?צ×?"
     },
     "misc": {
diff --git a/hi.json b/hi.json
index e3501b654..5062143f6 100644
--- a/hi.json
+++ b/hi.json
@@ -5,18 +5,18 @@
 	"label": "Most Frequently Asked Questions"
     },
     "tbb": {
-	"path": "#tor-browser",
-	"control": "tor-browser",
+	"path": "#tbb",
+	"control": "tbb",
 	"label": "��र वि�र�"
     },
     "tormessenger": {
-	"path": "#tor-messenger",
-	"control": "tor-messenger",
+	"path": "#tormessenger",
+	"control": "tormessenger",
 	"label": "Tor Messenger"
     },
     "tormobile": {
-	"path": "#tor-mobile",
-	"control": "tor-mobile",
+	"path": "#tormobile",
+	"control": "tormobile",
 	"label": "Tor Mobile"
     },
     "gettor": {
@@ -25,8 +25,8 @@
 	"label": "GetTor"
     },
     "connecting": {
-	"path": "#connecting-to-tor",
-	"control": "connecting-to-tor",
+	"path": "#connectingtotor",
+	"control": "connectingtotor",
 	"label": "Connecting To Tor"
     },
     "censorship": {
@@ -45,8 +45,8 @@
 	"label": "Operators"
     },
     "onionservices": {
-	"path": "#onion-services",
-	"control": "onion-services",
+	"path": "#onionservices",
+	"control": "onionservices",
 	"label": "Onion Services"
     },
     "misc": {
diff --git a/hr.json b/hr.json
index 8d9b68cba..78640a921 100644
--- a/hr.json
+++ b/hr.json
@@ -5,18 +5,18 @@
 	"label": "Most Frequently Asked Questions"
     },
     "tbb": {
-	"path": "#tor-browser",
-	"control": "tor-browser",
+	"path": "#tbb",
+	"control": "tbb",
 	"label": "Tor Preglednik"
     },
     "tormessenger": {
-	"path": "#tor-messenger",
-	"control": "tor-messenger",
+	"path": "#tormessenger",
+	"control": "tormessenger",
 	"label": "Tor Messenger"
     },
     "tormobile": {
-	"path": "#tor-mobile",
-	"control": "tor-mobile",
+	"path": "#tormobile",
+	"control": "tormobile",
 	"label": "Tor Mobile"
     },
     "gettor": {
@@ -25,8 +25,8 @@
 	"label": "GetTor"
     },
     "connecting": {
-	"path": "#connecting-to-tor",
-	"control": "connecting-to-tor",
+	"path": "#connectingtotor",
+	"control": "connectingtotor",
 	"label": "Connecting To Tor"
     },
     "censorship": {
@@ -45,8 +45,8 @@
 	"label": "Operators"
     },
     "onionservices": {
-	"path": "#onion-services",
-	"control": "onion-services",
+	"path": "#onionservices",
+	"control": "onionservices",
 	"label": "Onion Services"
     },
     "misc": {
diff --git a/hr_HR.json b/hr_HR.json
index d14d781f4..9a8757f46 100644
--- a/hr_HR.json
+++ b/hr_HR.json
@@ -5,18 +5,18 @@
 	"label": "Most Frequently Asked Questions"
     },
     "tbb": {
-	"path": "#tor-browser",
-	"control": "tor-browser",
+	"path": "#tbb",
+	"control": "tbb",
 	"label": "Tor Browser"
     },
     "tormessenger": {
-	"path": "#tor-messenger",
-	"control": "tor-messenger",
+	"path": "#tormessenger",
+	"control": "tormessenger",
 	"label": "Tor Messenger"
     },
     "tormobile": {
-	"path": "#tor-mobile",
-	"control": "tor-mobile",
+	"path": "#tormobile",
+	"control": "tormobile",
 	"label": "Tor Mobile"
     },
     "gettor": {
@@ -25,8 +25,8 @@
 	"label": "GetTor"
     },
     "connecting": {
-	"path": "#connecting-to-tor",
-	"control": "connecting-to-tor",
+	"path": "#connectingtotor",
+	"control": "connectingtotor",
 	"label": "Connecting To Tor"
     },
     "censorship": {
@@ -45,8 +45,8 @@
 	"label": "Operators"
     },
     "onionservices": {
-	"path": "#onion-services",
-	"control": "onion-services",
+	"path": "#onionservices",
+	"control": "onionservices",
 	"label": "Onion usluge"
     },
     "misc": {
diff --git a/ht.json b/ht.json
index 7b9006505..63a46e0ca 100644
--- a/ht.json
+++ b/ht.json
@@ -5,18 +5,18 @@
 	"label": "Most Frequently Asked Questions"
     },
     "tbb": {
-	"path": "#tor-browser",
-	"control": "tor-browser",
+	"path": "#tbb",
+	"control": "tbb",
 	"label": "Tor Browser"
     },
     "tormessenger": {
-	"path": "#tor-messenger",
-	"control": "tor-messenger",
+	"path": "#tormessenger",
+	"control": "tormessenger",
 	"label": "Tor Messenger"
     },
     "tormobile": {
-	"path": "#tor-mobile",
-	"control": "tor-mobile",
+	"path": "#tormobile",
+	"control": "tormobile",
 	"label": "Tor Mobile"
     },
     "gettor": {
@@ -25,8 +25,8 @@
 	"label": "GetTor"
     },
     "connecting": {
-	"path": "#connecting-to-tor",
-	"control": "connecting-to-tor",
+	"path": "#connectingtotor",
+	"control": "connectingtotor",
 	"label": "Connecting To Tor"
     },
     "censorship": {
@@ -45,8 +45,8 @@
 	"label": "Operators"
     },
     "onionservices": {
-	"path": "#onion-services",
-	"control": "onion-services",
+	"path": "#onionservices",
+	"control": "onionservices",
 	"label": "Onion Services"
     },
     "misc": {
diff --git a/hu.json b/hu.json
index 7b9006505..63a46e0ca 100644
--- a/hu.json
+++ b/hu.json
@@ -5,18 +5,18 @@
 	"label": "Most Frequently Asked Questions"
     },
     "tbb": {
-	"path": "#tor-browser",
-	"control": "tor-browser",
+	"path": "#tbb",
+	"control": "tbb",
 	"label": "Tor Browser"
     },
     "tormessenger": {
-	"path": "#tor-messenger",
-	"control": "tor-messenger",
+	"path": "#tormessenger",
+	"control": "tormessenger",
 	"label": "Tor Messenger"
     },
     "tormobile": {
-	"path": "#tor-mobile",
-	"control": "tor-mobile",
+	"path": "#tormobile",
+	"control": "tormobile",
 	"label": "Tor Mobile"
     },
     "gettor": {
@@ -25,8 +25,8 @@
 	"label": "GetTor"
     },
     "connecting": {
-	"path": "#connecting-to-tor",
-	"control": "connecting-to-tor",
+	"path": "#connectingtotor",
+	"control": "connectingtotor",
 	"label": "Connecting To Tor"
     },
     "censorship": {
@@ -45,8 +45,8 @@
 	"label": "Operators"
     },
     "onionservices": {
-	"path": "#onion-services",
-	"control": "onion-services",
+	"path": "#onionservices",
+	"control": "onionservices",
 	"label": "Onion Services"
     },
     "misc": {
diff --git a/hy.json b/hy.json
index 7b9006505..63a46e0ca 100644
--- a/hy.json
+++ b/hy.json
@@ -5,18 +5,18 @@
 	"label": "Most Frequently Asked Questions"
     },
     "tbb": {
-	"path": "#tor-browser",
-	"control": "tor-browser",
+	"path": "#tbb",
+	"control": "tbb",
 	"label": "Tor Browser"
     },
     "tormessenger": {
-	"path": "#tor-messenger",
-	"control": "tor-messenger",
+	"path": "#tormessenger",
+	"control": "tormessenger",
 	"label": "Tor Messenger"
     },
     "tormobile": {
-	"path": "#tor-mobile",
-	"control": "tor-mobile",
+	"path": "#tormobile",
+	"control": "tormobile",
 	"label": "Tor Mobile"
     },
     "gettor": {
@@ -25,8 +25,8 @@
 	"label": "GetTor"
     },
     "connecting": {
-	"path": "#connecting-to-tor",
-	"control": "connecting-to-tor",
+	"path": "#connectingtotor",
+	"control": "connectingtotor",
 	"label": "Connecting To Tor"
     },
     "censorship": {
@@ -45,8 +45,8 @@
 	"label": "Operators"
     },
     "onionservices": {
-	"path": "#onion-services",
-	"control": "onion-services",
+	"path": "#onionservices",
+	"control": "onionservices",
 	"label": "Onion Services"
     },
     "misc": {
diff --git a/ia.json b/ia.json
index 7b9006505..63a46e0ca 100644
--- a/ia.json
+++ b/ia.json
@@ -5,18 +5,18 @@
 	"label": "Most Frequently Asked Questions"
     },
     "tbb": {
-	"path": "#tor-browser",
-	"control": "tor-browser",
+	"path": "#tbb",
+	"control": "tbb",
 	"label": "Tor Browser"
     },
     "tormessenger": {
-	"path": "#tor-messenger",
-	"control": "tor-messenger",
+	"path": "#tormessenger",
+	"control": "tormessenger",
 	"label": "Tor Messenger"
     },
     "tormobile": {
-	"path": "#tor-mobile",
-	"control": "tor-mobile",
+	"path": "#tormobile",
+	"control": "tormobile",
 	"label": "Tor Mobile"
     },
     "gettor": {
@@ -25,8 +25,8 @@
 	"label": "GetTor"
     },
     "connecting": {
-	"path": "#connecting-to-tor",
-	"control": "connecting-to-tor",
+	"path": "#connectingtotor",
+	"control": "connectingtotor",
 	"label": "Connecting To Tor"
     },
     "censorship": {
@@ -45,8 +45,8 @@
 	"label": "Operators"
     },
     "onionservices": {
-	"path": "#onion-services",
-	"control": "onion-services",
+	"path": "#onionservices",
+	"control": "onionservices",
 	"label": "Onion Services"
     },
     "misc": {
diff --git a/id.json b/id.json
index 5dbe65f46..46516ac86 100644
--- a/id.json
+++ b/id.json
@@ -5,18 +5,18 @@
 	"label": "Most Frequently Asked Questions"
     },
     "tbb": {
-	"path": "#tor-browser",
-	"control": "tor-browser",
+	"path": "#tbb",
+	"control": "tbb",
 	"label": "Peramban Tor"
     },
     "tormessenger": {
-	"path": "#tor-messenger",
-	"control": "tor-messenger",
+	"path": "#tormessenger",
+	"control": "tormessenger",
 	"label": "Tor Messenger"
     },
     "tormobile": {
-	"path": "#tor-mobile",
-	"control": "tor-mobile",
+	"path": "#tormobile",
+	"control": "tormobile",
 	"label": "Tor Mobile"
     },
     "gettor": {
@@ -25,8 +25,8 @@
 	"label": "GetTor"
     },
     "connecting": {
-	"path": "#connecting-to-tor",
-	"control": "connecting-to-tor",
+	"path": "#connectingtotor",
+	"control": "connectingtotor",
 	"label": "Terhubung ke Tor"
     },
     "censorship": {
@@ -45,8 +45,8 @@
 	"label": "Operator"
     },
     "onionservices": {
-	"path": "#onion-services",
-	"control": "onion-services",
+	"path": "#onionservices",
+	"control": "onionservices",
 	"label": "Layanan Onion"
     },
     "misc": {
diff --git a/is.json b/is.json
index bfa8073d1..d14440ea8 100644
--- a/is.json
+++ b/is.json
@@ -5,18 +5,18 @@
 	"label": "Algengustu spurningar - FAQ"
     },
     "tbb": {
-	"path": "#tor-vafrinn",
-	"control": "tor-vafrinn",
+	"path": "#tbb",
+	"control": "tbb",
 	"label": "Tor-vafrinn"
     },
     "tormessenger": {
-	"path": "#tor-messenger",
-	"control": "tor-messenger",
+	"path": "#tormessenger",
+	"control": "tormessenger",
 	"label": "Tor Messenger"
     },
     "tormobile": {
-	"path": "#tor-mobile",
-	"control": "tor-mobile",
+	"path": "#tormobile",
+	"control": "tormobile",
 	"label": "Tor Mobile"
     },
     "gettor": {
@@ -25,8 +25,8 @@
 	"label": "GetTor"
     },
     "connecting": {
-	"path": "#tengjast-tor",
-	"control": "tengjast-tor",
+	"path": "#connectingtotor",
+	"control": "connectingtotor",
 	"label": "Tengjast við Tor-netið"
     },
     "censorship": {
@@ -45,8 +45,8 @@
 	"label": "Operators"
     },
     "onionservices": {
-	"path": "#onion-þjónustur",
-	"control": "onion-þjónustur",
+	"path": "#onionservices",
+	"control": "onionservices",
 	"label": "Onion-þjónustur"
     },
     "misc": {
diff --git a/it.json b/it.json
index 51b8e3d58..7f29e7105 100644
--- a/it.json
+++ b/it.json
@@ -5,18 +5,18 @@
 	"label": "Domande più frequenti"
     },
     "tbb": {
-	"path": "#tor-browser",
-	"control": "tor-browser",
+	"path": "#tbb",
+	"control": "tbb",
 	"label": "Tor Browser"
     },
     "tormessenger": {
-	"path": "#tor-messenger",
-	"control": "tor-messenger",
+	"path": "#tormessenger",
+	"control": "tormessenger",
 	"label": "Tor Messenger"
     },
     "tormobile": {
-	"path": "#tor-mobile",
-	"control": "tor-mobile",
+	"path": "#tormobile",
+	"control": "tormobile",
 	"label": "Tor Mobile"
     },
     "gettor": {
@@ -25,8 +25,8 @@
 	"label": "OttieniTor"
     },
     "connecting": {
-	"path": "#connessione-a-tor",
-	"control": "connessione-a-tor",
+	"path": "#connectingtotor",
+	"control": "connectingtotor",
 	"label": "Connessione a Tor"
     },
     "censorship": {
@@ -45,8 +45,8 @@
 	"label": "Operatori"
     },
     "onionservices": {
-	"path": "#servizi-onion",
-	"control": "servizi-onion",
+	"path": "#onionservices",
+	"control": "onionservices",
 	"label": "Servizi Onion"
     },
     "misc": {
diff --git a/ja.json b/ja.json
index 30427c013..54f01c9c8 100644
--- a/ja.json
+++ b/ja.json
@@ -5,18 +5,18 @@
 	"label": "Most Frequently Asked Questions"
     },
     "tbb": {
-	"path": "#tor-browser",
-	"control": "tor-browser",
+	"path": "#tbb",
+	"control": "tbb",
 	"label": "Tor ã??ã?©ã?¦ã?¶ã?¼"
     },
     "tormessenger": {
-	"path": "#tor-messenger",
-	"control": "tor-messenger",
+	"path": "#tormessenger",
+	"control": "tormessenger",
 	"label": "Tor Messenger"
     },
     "tormobile": {
-	"path": "#tor-mobile",
-	"control": "tor-mobile",
+	"path": "#tormobile",
+	"control": "tormobile",
 	"label": "Tor Mobile"
     },
     "gettor": {
@@ -25,8 +25,8 @@
 	"label": "GetTor"
     },
     "connecting": {
-	"path": "#connecting-to-tor",
-	"control": "connecting-to-tor",
+	"path": "#connectingtotor",
+	"control": "connectingtotor",
 	"label": "Connecting To Tor"
     },
     "censorship": {
@@ -45,8 +45,8 @@
 	"label": "Operators"
     },
     "onionservices": {
-	"path": "#onion-services",
-	"control": "onion-services",
+	"path": "#onionservices",
+	"control": "onionservices",
 	"label": "Onion Services"
     },
     "misc": {
diff --git a/jv.json b/jv.json
index 7b9006505..63a46e0ca 100644
--- a/jv.json
+++ b/jv.json
@@ -5,18 +5,18 @@
 	"label": "Most Frequently Asked Questions"
     },
     "tbb": {
-	"path": "#tor-browser",
-	"control": "tor-browser",
+	"path": "#tbb",
+	"control": "tbb",
 	"label": "Tor Browser"
     },
     "tormessenger": {
-	"path": "#tor-messenger",
-	"control": "tor-messenger",
+	"path": "#tormessenger",
+	"control": "tormessenger",
 	"label": "Tor Messenger"
     },
     "tormobile": {
-	"path": "#tor-mobile",
-	"control": "tor-mobile",
+	"path": "#tormobile",
+	"control": "tormobile",
 	"label": "Tor Mobile"
     },
     "gettor": {
@@ -25,8 +25,8 @@
 	"label": "GetTor"
     },
     "connecting": {
-	"path": "#connecting-to-tor",
-	"control": "connecting-to-tor",
+	"path": "#connectingtotor",
+	"control": "connectingtotor",
 	"label": "Connecting To Tor"
     },
     "censorship": {
@@ -45,8 +45,8 @@
 	"label": "Operators"
     },
     "onionservices": {
-	"path": "#onion-services",
-	"control": "onion-services",
+	"path": "#onionservices",
+	"control": "onionservices",
 	"label": "Onion Services"
     },
     "misc": {
diff --git a/ka.json b/ka.json
index 7b9006505..63a46e0ca 100644
--- a/ka.json
+++ b/ka.json
@@ -5,18 +5,18 @@
 	"label": "Most Frequently Asked Questions"
     },
     "tbb": {
-	"path": "#tor-browser",
-	"control": "tor-browser",
+	"path": "#tbb",
+	"control": "tbb",
 	"label": "Tor Browser"
     },
     "tormessenger": {
-	"path": "#tor-messenger",
-	"control": "tor-messenger",
+	"path": "#tormessenger",
+	"control": "tormessenger",
 	"label": "Tor Messenger"
     },
     "tormobile": {
-	"path": "#tor-mobile",
-	"control": "tor-mobile",
+	"path": "#tormobile",
+	"control": "tormobile",
 	"label": "Tor Mobile"
     },
     "gettor": {
@@ -25,8 +25,8 @@
 	"label": "GetTor"
     },
     "connecting": {
-	"path": "#connecting-to-tor",
-	"control": "connecting-to-tor",
+	"path": "#connectingtotor",
+	"control": "connectingtotor",
 	"label": "Connecting To Tor"
     },
     "censorship": {
@@ -45,8 +45,8 @@
 	"label": "Operators"
     },
     "onionservices": {
-	"path": "#onion-services",
-	"control": "onion-services",
+	"path": "#onionservices",
+	"control": "onionservices",
 	"label": "Onion Services"
     },
     "misc": {
diff --git a/kk.json b/kk.json
index 5717337b6..06444473f 100644
--- a/kk.json
+++ b/kk.json
@@ -5,18 +5,18 @@
 	"label": "Most Frequently Asked Questions"
     },
     "tbb": {
-	"path": "#tor-browser",
-	"control": "tor-browser",
+	"path": "#tbb",
+	"control": "tbb",
 	"label": "Tor Browser"
     },
     "tormessenger": {
-	"path": "#tor-messenger",
-	"control": "tor-messenger",
+	"path": "#tormessenger",
+	"control": "tormessenger",
 	"label": "Tor Messenger"
     },
     "tormobile": {
-	"path": "#tor-mobile",
-	"control": "tor-mobile",
+	"path": "#tormobile",
+	"control": "tormobile",
 	"label": "Tor Mobile"
     },
     "gettor": {
@@ -25,8 +25,8 @@
 	"label": "GetTor"
     },
     "connecting": {
-	"path": "#connecting-to-tor",
-	"control": "connecting-to-tor",
+	"path": "#connectingtotor",
+	"control": "connectingtotor",
 	"label": "Connecting To Tor"
     },
     "censorship": {
@@ -45,8 +45,8 @@
 	"label": "Operators"
     },
     "onionservices": {
-	"path": "#onion-services",
-	"control": "onion-services",
+	"path": "#onionservices",
+	"control": "onionservices",
 	"label": "Onion Services"
     },
     "misc": {
diff --git a/km.json b/km.json
index 17ccb4234..43a5c3222 100644
--- a/km.json
+++ b/km.json
@@ -5,18 +5,18 @@
 	"label": "Most Frequently Asked Questions"
     },
     "tbb": {
-	"path": "#tor-browser",
-	"control": "tor-browser",
+	"path": "#tbb",
+	"control": "tbb",
 	"label": "Tor Browser"
     },
     "tormessenger": {
-	"path": "#tor-messenger",
-	"control": "tor-messenger",
+	"path": "#tormessenger",
+	"control": "tormessenger",
 	"label": "Tor Messenger"
     },
     "tormobile": {
-	"path": "#tor-mobile",
-	"control": "tor-mobile",
+	"path": "#tormobile",
+	"control": "tormobile",
 	"label": "Tor Mobile"
     },
     "gettor": {
@@ -25,8 +25,8 @@
 	"label": "GetTor"
     },
     "connecting": {
-	"path": "#connecting-to-tor",
-	"control": "connecting-to-tor",
+	"path": "#connectingtotor",
+	"control": "connectingtotor",
 	"label": "Connecting To Tor"
     },
     "censorship": {
@@ -45,8 +45,8 @@
 	"label": "Operators"
     },
     "onionservices": {
-	"path": "#onion-services",
-	"control": "onion-services",
+	"path": "#onionservices",
+	"control": "onionservices",
 	"label": "Onion Services"
     },
     "misc": {
diff --git a/kn.json b/kn.json
index fceea6813..7b6ae9322 100644
--- a/kn.json
+++ b/kn.json
@@ -5,18 +5,18 @@
 	"label": "Most Frequently Asked Questions"
     },
     "tbb": {
-	"path": "#tor-browser",
-	"control": "tor-browser",
+	"path": "#tbb",
+	"control": "tbb",
 	"label": "�ಾರ� ಬ�ರ�ಸರ�"
     },
     "tormessenger": {
-	"path": "#tor-messenger",
-	"control": "tor-messenger",
+	"path": "#tormessenger",
+	"control": "tormessenger",
 	"label": "Tor Messenger"
     },
     "tormobile": {
-	"path": "#tor-mobile",
-	"control": "tor-mobile",
+	"path": "#tormobile",
+	"control": "tormobile",
 	"label": "Tor Mobile"
     },
     "gettor": {
@@ -25,8 +25,8 @@
 	"label": "GetTor"
     },
     "connecting": {
-	"path": "#connecting-to-tor",
-	"control": "connecting-to-tor",
+	"path": "#connectingtotor",
+	"control": "connectingtotor",
 	"label": "Connecting To Tor"
     },
     "censorship": {
@@ -45,8 +45,8 @@
 	"label": "Operators"
     },
     "onionservices": {
-	"path": "#onion-services",
-	"control": "onion-services",
+	"path": "#onionservices",
+	"control": "onionservices",
 	"label": "Onion Services"
     },
     "misc": {
diff --git a/ko.json b/ko.json
index b5a779342..bc8409668 100644
--- a/ko.json
+++ b/ko.json
@@ -5,18 +5,18 @@
 	"label": "Most Frequently Asked Questions"
     },
     "tbb": {
-	"path": "#tor-browser",
-	"control": "tor-browser",
+	"path": "#tbb",
+	"control": "tbb",
 	"label": "Tor ����"
     },
     "tormessenger": {
-	"path": "#tor-messenger",
-	"control": "tor-messenger",
+	"path": "#tormessenger",
+	"control": "tormessenger",
 	"label": "Tor Messenger"
     },
     "tormobile": {
-	"path": "#tor-mobile",
-	"control": "tor-mobile",
+	"path": "#tormobile",
+	"control": "tormobile",
 	"label": "Tor Mobile"
     },
     "gettor": {
@@ -25,8 +25,8 @@
 	"label": "GetTor"
     },
     "connecting": {
-	"path": "#connecting-to-tor",
-	"control": "connecting-to-tor",
+	"path": "#connectingtotor",
+	"control": "connectingtotor",
 	"label": "Connecting To Tor"
     },
     "censorship": {
@@ -45,8 +45,8 @@
 	"label": "Operators"
     },
     "onionservices": {
-	"path": "#onion-services",
-	"control": "onion-services",
+	"path": "#onionservices",
+	"control": "onionservices",
 	"label": "Onion Services"
     },
     "misc": {
diff --git a/ko_KR.json b/ko_KR.json
index b21a90853..d2080cad3 100644
--- a/ko_KR.json
+++ b/ko_KR.json
@@ -5,18 +5,18 @@
 	"label": "Most Frequently Asked Questions"
     },
     "tbb": {
-	"path": "#tor-browser",
-	"control": "tor-browser",
+	"path": "#tbb",
+	"control": "tbb",
 	"label": "Tor ����"
     },
     "tormessenger": {
-	"path": "#tor-messenger",
-	"control": "tor-messenger",
+	"path": "#tormessenger",
+	"control": "tormessenger",
 	"label": "Tor Messenger"
     },
     "tormobile": {
-	"path": "#tor-mobile",
-	"control": "tor-mobile",
+	"path": "#tormobile",
+	"control": "tormobile",
 	"label": "Tor Mobile"
     },
     "gettor": {
@@ -25,8 +25,8 @@
 	"label": "GetTor"
     },
     "connecting": {
-	"path": "#connecting-to-tor",
-	"control": "connecting-to-tor",
+	"path": "#connectingtotor",
+	"control": "connectingtotor",
 	"label": "Connecting To Tor"
     },
     "censorship": {
@@ -45,8 +45,8 @@
 	"label": "Operators"
     },
     "onionservices": {
-	"path": "#onion-services",
-	"control": "onion-services",
+	"path": "#onionservices",
+	"control": "onionservices",
 	"label": "Onion Services"
     },
     "misc": {
diff --git a/ku.json b/ku.json
index 7b9006505..63a46e0ca 100644
--- a/ku.json
+++ b/ku.json
@@ -5,18 +5,18 @@
 	"label": "Most Frequently Asked Questions"
     },
     "tbb": {
-	"path": "#tor-browser",
-	"control": "tor-browser",
+	"path": "#tbb",
+	"control": "tbb",
 	"label": "Tor Browser"
     },
     "tormessenger": {
-	"path": "#tor-messenger",
-	"control": "tor-messenger",
+	"path": "#tormessenger",
+	"control": "tormessenger",
 	"label": "Tor Messenger"
     },
     "tormobile": {
-	"path": "#tor-mobile",
-	"control": "tor-mobile",
+	"path": "#tormobile",
+	"control": "tormobile",
 	"label": "Tor Mobile"
     },
     "gettor": {
@@ -25,8 +25,8 @@
 	"label": "GetTor"
     },
     "connecting": {
-	"path": "#connecting-to-tor",
-	"control": "connecting-to-tor",
+	"path": "#connectingtotor",
+	"control": "connectingtotor",
 	"label": "Connecting To Tor"
     },
     "censorship": {
@@ -45,8 +45,8 @@
 	"label": "Operators"
     },
     "onionservices": {
-	"path": "#onion-services",
-	"control": "onion-services",
+	"path": "#onionservices",
+	"control": "onionservices",
 	"label": "Onion Services"
     },
     "misc": {
diff --git a/ku_IQ.json b/ku_IQ.json
index 631f19d53..5cc6e0315 100644
--- a/ku_IQ.json
+++ b/ku_IQ.json
@@ -5,18 +5,18 @@
 	"label": "Most Frequently Asked Questions"
     },
     "tbb": {
-	"path": "#tor-browser",
-	"control": "tor-browser",
+	"path": "#tbb",
+	"control": "tbb",
 	"label": "Ù?Û?بگÛ?Ú?Û? Tor"
     },
     "tormessenger": {
-	"path": "#tor-messenger",
-	"control": "tor-messenger",
+	"path": "#tormessenger",
+	"control": "tormessenger",
 	"label": "Tor Messenger"
     },
     "tormobile": {
-	"path": "#tor-mobile",
-	"control": "tor-mobile",
+	"path": "#tormobile",
+	"control": "tormobile",
 	"label": "Tor Mobile"
     },
     "gettor": {
@@ -25,8 +25,8 @@
 	"label": "GetTor"
     },
     "connecting": {
-	"path": "#connecting-to-tor",
-	"control": "connecting-to-tor",
+	"path": "#connectingtotor",
+	"control": "connectingtotor",
 	"label": "Connecting To Tor"
     },
     "censorship": {
@@ -45,8 +45,8 @@
 	"label": "Operators"
     },
     "onionservices": {
-	"path": "#onion-services",
-	"control": "onion-services",
+	"path": "#onionservices",
+	"control": "onionservices",
 	"label": "Onion Services"
     },
     "misc": {
diff --git a/kw.json b/kw.json
index 7b9006505..63a46e0ca 100644
--- a/kw.json
+++ b/kw.json
@@ -5,18 +5,18 @@
 	"label": "Most Frequently Asked Questions"
     },
     "tbb": {
-	"path": "#tor-browser",
-	"control": "tor-browser",
+	"path": "#tbb",
+	"control": "tbb",
 	"label": "Tor Browser"
     },
     "tormessenger": {
-	"path": "#tor-messenger",
-	"control": "tor-messenger",
+	"path": "#tormessenger",
+	"control": "tormessenger",
 	"label": "Tor Messenger"
     },
     "tormobile": {
-	"path": "#tor-mobile",
-	"control": "tor-mobile",
+	"path": "#tormobile",
+	"control": "tormobile",
 	"label": "Tor Mobile"
     },
     "gettor": {
@@ -25,8 +25,8 @@
 	"label": "GetTor"
     },
     "connecting": {
-	"path": "#connecting-to-tor",
-	"control": "connecting-to-tor",
+	"path": "#connectingtotor",
+	"control": "connectingtotor",
 	"label": "Connecting To Tor"
     },
     "censorship": {
@@ -45,8 +45,8 @@
 	"label": "Operators"
     },
     "onionservices": {
-	"path": "#onion-services",
-	"control": "onion-services",
+	"path": "#onionservices",
+	"control": "onionservices",
 	"label": "Onion Services"
     },
     "misc": {
diff --git a/ky.json b/ky.json
index 5717337b6..06444473f 100644
--- a/ky.json
+++ b/ky.json
@@ -5,18 +5,18 @@
 	"label": "Most Frequently Asked Questions"
     },
     "tbb": {
-	"path": "#tor-browser",
-	"control": "tor-browser",
+	"path": "#tbb",
+	"control": "tbb",
 	"label": "Tor Browser"
     },
     "tormessenger": {
-	"path": "#tor-messenger",
-	"control": "tor-messenger",
+	"path": "#tormessenger",
+	"control": "tormessenger",
 	"label": "Tor Messenger"
     },
     "tormobile": {
-	"path": "#tor-mobile",
-	"control": "tor-mobile",
+	"path": "#tormobile",
+	"control": "tormobile",
 	"label": "Tor Mobile"
     },
     "gettor": {
@@ -25,8 +25,8 @@
 	"label": "GetTor"
     },
     "connecting": {
-	"path": "#connecting-to-tor",
-	"control": "connecting-to-tor",
+	"path": "#connectingtotor",
+	"control": "connectingtotor",
 	"label": "Connecting To Tor"
     },
     "censorship": {
@@ -45,8 +45,8 @@
 	"label": "Operators"
     },
     "onionservices": {
-	"path": "#onion-services",
-	"control": "onion-services",
+	"path": "#onionservices",
+	"control": "onionservices",
 	"label": "Onion Services"
     },
     "misc": {
diff --git a/la.json b/la.json
index 65f94284b..21eaf58bd 100644
--- a/la.json
+++ b/la.json
@@ -5,18 +5,18 @@
 	"label": "Most Frequently Asked Questions"
     },
     "tbb": {
-	"path": "#tor-browser",
-	"control": "tor-browser",
+	"path": "#tbb",
+	"control": "tbb",
 	"label": "Tor Navis"
     },
     "tormessenger": {
-	"path": "#tor-messenger",
-	"control": "tor-messenger",
+	"path": "#tormessenger",
+	"control": "tormessenger",
 	"label": "Tor Messenger"
     },
     "tormobile": {
-	"path": "#tor-mobile",
-	"control": "tor-mobile",
+	"path": "#tormobile",
+	"control": "tormobile",
 	"label": "Tor Mobile"
     },
     "gettor": {
@@ -25,8 +25,8 @@
 	"label": "GetTor"
     },
     "connecting": {
-	"path": "#connecting-to-tor",
-	"control": "connecting-to-tor",
+	"path": "#connectingtotor",
+	"control": "connectingtotor",
 	"label": "Connecting To Tor"
     },
     "censorship": {
@@ -45,8 +45,8 @@
 	"label": "Operators"
     },
     "onionservices": {
-	"path": "#onion-services",
-	"control": "onion-services",
+	"path": "#onionservices",
+	"control": "onionservices",
 	"label": "Onion Services"
     },
     "misc": {
diff --git a/lb.json b/lb.json
index 7b9006505..63a46e0ca 100644
--- a/lb.json
+++ b/lb.json
@@ -5,18 +5,18 @@
 	"label": "Most Frequently Asked Questions"
     },
     "tbb": {
-	"path": "#tor-browser",
-	"control": "tor-browser",
+	"path": "#tbb",
+	"control": "tbb",
 	"label": "Tor Browser"
     },
     "tormessenger": {
-	"path": "#tor-messenger",
-	"control": "tor-messenger",
+	"path": "#tormessenger",
+	"control": "tormessenger",
 	"label": "Tor Messenger"
     },
     "tormobile": {
-	"path": "#tor-mobile",
-	"control": "tor-mobile",
+	"path": "#tormobile",
+	"control": "tormobile",
 	"label": "Tor Mobile"
     },
     "gettor": {
@@ -25,8 +25,8 @@
 	"label": "GetTor"
     },
     "connecting": {
-	"path": "#connecting-to-tor",
-	"control": "connecting-to-tor",
+	"path": "#connectingtotor",
+	"control": "connectingtotor",
 	"label": "Connecting To Tor"
     },
     "censorship": {
@@ -45,8 +45,8 @@
 	"label": "Operators"
     },
     "onionservices": {
-	"path": "#onion-services",
-	"control": "onion-services",
+	"path": "#onionservices",
+	"control": "onionservices",
 	"label": "Onion Services"
     },
     "misc": {
diff --git a/lg.json b/lg.json
index 7b9006505..63a46e0ca 100644
--- a/lg.json
+++ b/lg.json
@@ -5,18 +5,18 @@
 	"label": "Most Frequently Asked Questions"
     },
     "tbb": {
-	"path": "#tor-browser",
-	"control": "tor-browser",
+	"path": "#tbb",
+	"control": "tbb",
 	"label": "Tor Browser"
     },
     "tormessenger": {
-	"path": "#tor-messenger",
-	"control": "tor-messenger",
+	"path": "#tormessenger",
+	"control": "tormessenger",
 	"label": "Tor Messenger"
     },
     "tormobile": {
-	"path": "#tor-mobile",
-	"control": "tor-mobile",
+	"path": "#tormobile",
+	"control": "tormobile",
 	"label": "Tor Mobile"
     },
     "gettor": {
@@ -25,8 +25,8 @@
 	"label": "GetTor"
     },
     "connecting": {
-	"path": "#connecting-to-tor",
-	"control": "connecting-to-tor",
+	"path": "#connectingtotor",
+	"control": "connectingtotor",
 	"label": "Connecting To Tor"
     },
     "censorship": {
@@ -45,8 +45,8 @@
 	"label": "Operators"
     },
     "onionservices": {
-	"path": "#onion-services",
-	"control": "onion-services",
+	"path": "#onionservices",
+	"control": "onionservices",
 	"label": "Onion Services"
     },
     "misc": {
diff --git a/ln.json b/ln.json
index 7b9006505..63a46e0ca 100644
--- a/ln.json
+++ b/ln.json
@@ -5,18 +5,18 @@
 	"label": "Most Frequently Asked Questions"
     },
     "tbb": {
-	"path": "#tor-browser",
-	"control": "tor-browser",
+	"path": "#tbb",
+	"control": "tbb",
 	"label": "Tor Browser"
     },
     "tormessenger": {
-	"path": "#tor-messenger",
-	"control": "tor-messenger",
+	"path": "#tormessenger",
+	"control": "tormessenger",
 	"label": "Tor Messenger"
     },
     "tormobile": {
-	"path": "#tor-mobile",
-	"control": "tor-mobile",
+	"path": "#tormobile",
+	"control": "tormobile",
 	"label": "Tor Mobile"
     },
     "gettor": {
@@ -25,8 +25,8 @@
 	"label": "GetTor"
     },
     "connecting": {
-	"path": "#connecting-to-tor",
-	"control": "connecting-to-tor",
+	"path": "#connectingtotor",
+	"control": "connectingtotor",
 	"label": "Connecting To Tor"
     },
     "censorship": {
@@ -45,8 +45,8 @@
 	"label": "Operators"
     },
     "onionservices": {
-	"path": "#onion-services",
-	"control": "onion-services",
+	"path": "#onionservices",
+	"control": "onionservices",
 	"label": "Onion Services"
     },
     "misc": {
diff --git a/lo.json b/lo.json
index 20b08991d..bfae47a53 100644
--- a/lo.json
+++ b/lo.json
@@ -5,18 +5,18 @@
 	"label": "Most Frequently Asked Questions"
     },
     "tbb": {
-	"path": "#tor-browser",
-	"control": "tor-browser",
+	"path": "#tbb",
+	"control": "tbb",
 	"label": "�ົວ�ອ��ົ�� ��ຣ�"
     },
     "tormessenger": {
-	"path": "#tor-messenger",
-	"control": "tor-messenger",
+	"path": "#tormessenger",
+	"control": "tormessenger",
 	"label": "Tor Messenger"
     },
     "tormobile": {
-	"path": "#tor-mobile",
-	"control": "tor-mobile",
+	"path": "#tormobile",
+	"control": "tormobile",
 	"label": "Tor Mobile"
     },
     "gettor": {
@@ -25,8 +25,8 @@
 	"label": "GetTor"
     },
     "connecting": {
-	"path": "#connecting-to-tor",
-	"control": "connecting-to-tor",
+	"path": "#connectingtotor",
+	"control": "connectingtotor",
 	"label": "Connecting To Tor"
     },
     "censorship": {
@@ -45,8 +45,8 @@
 	"label": "Operators"
     },
     "onionservices": {
-	"path": "#onion-services",
-	"control": "onion-services",
+	"path": "#onionservices",
+	"control": "onionservices",
 	"label": "Onion Services"
     },
     "misc": {
diff --git a/lt.json b/lt.json
index d9f07e165..17914c11e 100644
--- a/lt.json
+++ b/lt.json
@@ -5,18 +5,18 @@
 	"label": "Most Frequently Asked Questions"
     },
     "tbb": {
-	"path": "#tor-browser",
-	"control": "tor-browser",
+	"path": "#tbb",
+	"control": "tbb",
 	"label": "Tor narÅ¡yklÄ?"
     },
     "tormessenger": {
-	"path": "#tor-messenger",
-	"control": "tor-messenger",
+	"path": "#tormessenger",
+	"control": "tormessenger",
 	"label": "Tor Messenger"
     },
     "tormobile": {
-	"path": "#tor-mobile",
-	"control": "tor-mobile",
+	"path": "#tormobile",
+	"control": "tormobile",
 	"label": "Tor Mobile"
     },
     "gettor": {
@@ -25,8 +25,8 @@
 	"label": "GetTor"
     },
     "connecting": {
-	"path": "#connecting-to-tor",
-	"control": "connecting-to-tor",
+	"path": "#connectingtotor",
+	"control": "connectingtotor",
 	"label": "Connecting To Tor"
     },
     "censorship": {
@@ -45,8 +45,8 @@
 	"label": "Operators"
     },
     "onionservices": {
-	"path": "#onion-services",
-	"control": "onion-services",
+	"path": "#onionservices",
+	"control": "onionservices",
 	"label": "Onion Services"
     },
     "misc": {
diff --git a/lv.json b/lv.json
index ae553498b..5f7b1894e 100644
--- a/lv.json
+++ b/lv.json
@@ -5,18 +5,18 @@
 	"label": "Most Frequently Asked Questions"
     },
     "tbb": {
-	"path": "#tor-browser",
-	"control": "tor-browser",
+	"path": "#tbb",
+	"control": "tbb",
 	"label": "PÄ?rlÅ«ks Tor"
     },
     "tormessenger": {
-	"path": "#tor-messenger",
-	"control": "tor-messenger",
+	"path": "#tormessenger",
+	"control": "tormessenger",
 	"label": "Tor Messenger"
     },
     "tormobile": {
-	"path": "#tor-mobile",
-	"control": "tor-mobile",
+	"path": "#tormobile",
+	"control": "tormobile",
 	"label": "Tor Mobile"
     },
     "gettor": {
@@ -25,8 +25,8 @@
 	"label": "GetTor"
     },
     "connecting": {
-	"path": "#connecting-to-tor",
-	"control": "connecting-to-tor",
+	"path": "#connectingtotor",
+	"control": "connectingtotor",
 	"label": "Connecting To Tor"
     },
     "censorship": {
@@ -45,8 +45,8 @@
 	"label": "Operators"
     },
     "onionservices": {
-	"path": "#onion-services",
-	"control": "onion-services",
+	"path": "#onionservices",
+	"control": "onionservices",
 	"label": "SÄ«polpakalpojumi"
     },
     "misc": {
diff --git a/mg.json b/mg.json
index 7b9006505..63a46e0ca 100644
--- a/mg.json
+++ b/mg.json
@@ -5,18 +5,18 @@
 	"label": "Most Frequently Asked Questions"
     },
     "tbb": {
-	"path": "#tor-browser",
-	"control": "tor-browser",
+	"path": "#tbb",
+	"control": "tbb",
 	"label": "Tor Browser"
     },
     "tormessenger": {
-	"path": "#tor-messenger",
-	"control": "tor-messenger",
+	"path": "#tormessenger",
+	"control": "tormessenger",
 	"label": "Tor Messenger"
     },
     "tormobile": {
-	"path": "#tor-mobile",
-	"control": "tor-mobile",
+	"path": "#tormobile",
+	"control": "tormobile",
 	"label": "Tor Mobile"
     },
     "gettor": {
@@ -25,8 +25,8 @@
 	"label": "GetTor"
     },
     "connecting": {
-	"path": "#connecting-to-tor",
-	"control": "connecting-to-tor",
+	"path": "#connectingtotor",
+	"control": "connectingtotor",
 	"label": "Connecting To Tor"
     },
     "censorship": {
@@ -45,8 +45,8 @@
 	"label": "Operators"
     },
     "onionservices": {
-	"path": "#onion-services",
-	"control": "onion-services",
+	"path": "#onionservices",
+	"control": "onionservices",
 	"label": "Onion Services"
     },
     "misc": {
diff --git a/mi.json b/mi.json
index 7b9006505..63a46e0ca 100644
--- a/mi.json
+++ b/mi.json
@@ -5,18 +5,18 @@
 	"label": "Most Frequently Asked Questions"
     },
     "tbb": {
-	"path": "#tor-browser",
-	"control": "tor-browser",
+	"path": "#tbb",
+	"control": "tbb",
 	"label": "Tor Browser"
     },
     "tormessenger": {
-	"path": "#tor-messenger",
-	"control": "tor-messenger",
+	"path": "#tormessenger",
+	"control": "tormessenger",
 	"label": "Tor Messenger"
     },
     "tormobile": {
-	"path": "#tor-mobile",
-	"control": "tor-mobile",
+	"path": "#tormobile",
+	"control": "tormobile",
 	"label": "Tor Mobile"
     },
     "gettor": {
@@ -25,8 +25,8 @@
 	"label": "GetTor"
     },
     "connecting": {
-	"path": "#connecting-to-tor",
-	"control": "connecting-to-tor",
+	"path": "#connectingtotor",
+	"control": "connectingtotor",
 	"label": "Connecting To Tor"
     },
     "censorship": {
@@ -45,8 +45,8 @@
 	"label": "Operators"
     },
     "onionservices": {
-	"path": "#onion-services",
-	"control": "onion-services",
+	"path": "#onionservices",
+	"control": "onionservices",
 	"label": "Onion Services"
     },
     "misc": {
diff --git a/mk.json b/mk.json
index 7b9006505..63a46e0ca 100644
--- a/mk.json
+++ b/mk.json
@@ -5,18 +5,18 @@
 	"label": "Most Frequently Asked Questions"
     },
     "tbb": {
-	"path": "#tor-browser",
-	"control": "tor-browser",
+	"path": "#tbb",
+	"control": "tbb",
 	"label": "Tor Browser"
     },
     "tormessenger": {
-	"path": "#tor-messenger",
-	"control": "tor-messenger",
+	"path": "#tormessenger",
+	"control": "tormessenger",
 	"label": "Tor Messenger"
     },
     "tormobile": {
-	"path": "#tor-mobile",
-	"control": "tor-mobile",
+	"path": "#tormobile",
+	"control": "tormobile",
 	"label": "Tor Mobile"
     },
     "gettor": {
@@ -25,8 +25,8 @@
 	"label": "GetTor"
     },
     "connecting": {
-	"path": "#connecting-to-tor",
-	"control": "connecting-to-tor",
+	"path": "#connectingtotor",
+	"control": "connectingtotor",
 	"label": "Connecting To Tor"
     },
     "censorship": {
@@ -45,8 +45,8 @@
 	"label": "Operators"
     },
     "onionservices": {
-	"path": "#onion-services",
-	"control": "onion-services",
+	"path": "#onionservices",
+	"control": "onionservices",
 	"label": "Onion Services"
     },
     "misc": {
diff --git a/ml.json b/ml.json
index 2d4ad0b6b..d3d01995f 100644
--- a/ml.json
+++ b/ml.json
@@ -5,18 +5,18 @@
 	"label": "Most Frequently Asked Questions"
     },
     "tbb": {
-	"path": "#tor-browser",
-	"control": "tor-browser",
+	"path": "#tbb",
+	"control": "tbb",
 	"label": "Tor Browser"
     },
     "tormessenger": {
-	"path": "#tor-messenger",
-	"control": "tor-messenger",
+	"path": "#tormessenger",
+	"control": "tormessenger",
 	"label": "Tor Messenger"
     },
     "tormobile": {
-	"path": "#tor-mobile",
-	"control": "tor-mobile",
+	"path": "#tormobile",
+	"control": "tormobile",
 	"label": "Tor Mobile"
     },
     "gettor": {
@@ -25,8 +25,8 @@
 	"label": "GetTor"
     },
     "connecting": {
-	"path": "#connecting-to-tor",
-	"control": "connecting-to-tor",
+	"path": "#connectingtotor",
+	"control": "connectingtotor",
 	"label": "Connecting To Tor"
     },
     "censorship": {
@@ -45,8 +45,8 @@
 	"label": "Operators"
     },
     "onionservices": {
-	"path": "#onion-services",
-	"control": "onion-services",
+	"path": "#onionservices",
+	"control": "onionservices",
 	"label": "Onion Services"
     },
     "misc": {
diff --git a/mn.json b/mn.json
index 7b9006505..63a46e0ca 100644
--- a/mn.json
+++ b/mn.json
@@ -5,18 +5,18 @@
 	"label": "Most Frequently Asked Questions"
     },
     "tbb": {
-	"path": "#tor-browser",
-	"control": "tor-browser",
+	"path": "#tbb",
+	"control": "tbb",
 	"label": "Tor Browser"
     },
     "tormessenger": {
-	"path": "#tor-messenger",
-	"control": "tor-messenger",
+	"path": "#tormessenger",
+	"control": "tormessenger",
 	"label": "Tor Messenger"
     },
     "tormobile": {
-	"path": "#tor-mobile",
-	"control": "tor-mobile",
+	"path": "#tormobile",
+	"control": "tormobile",
 	"label": "Tor Mobile"
     },
     "gettor": {
@@ -25,8 +25,8 @@
 	"label": "GetTor"
     },
     "connecting": {
-	"path": "#connecting-to-tor",
-	"control": "connecting-to-tor",
+	"path": "#connectingtotor",
+	"control": "connectingtotor",
 	"label": "Connecting To Tor"
     },
     "censorship": {
@@ -45,8 +45,8 @@
 	"label": "Operators"
     },
     "onionservices": {
-	"path": "#onion-services",
-	"control": "onion-services",
+	"path": "#onionservices",
+	"control": "onionservices",
 	"label": "Onion Services"
     },
     "misc": {
diff --git a/mr.json b/mr.json
index 7b9006505..63a46e0ca 100644
--- a/mr.json
+++ b/mr.json
@@ -5,18 +5,18 @@
 	"label": "Most Frequently Asked Questions"
     },
     "tbb": {
-	"path": "#tor-browser",
-	"control": "tor-browser",
+	"path": "#tbb",
+	"control": "tbb",
 	"label": "Tor Browser"
     },
     "tormessenger": {
-	"path": "#tor-messenger",
-	"control": "tor-messenger",
+	"path": "#tormessenger",
+	"control": "tormessenger",
 	"label": "Tor Messenger"
     },
     "tormobile": {
-	"path": "#tor-mobile",
-	"control": "tor-mobile",
+	"path": "#tormobile",
+	"control": "tormobile",
 	"label": "Tor Mobile"
     },
     "gettor": {
@@ -25,8 +25,8 @@
 	"label": "GetTor"
     },
     "connecting": {
-	"path": "#connecting-to-tor",
-	"control": "connecting-to-tor",
+	"path": "#connectingtotor",
+	"control": "connectingtotor",
 	"label": "Connecting To Tor"
     },
     "censorship": {
@@ -45,8 +45,8 @@
 	"label": "Operators"
     },
     "onionservices": {
-	"path": "#onion-services",
-	"control": "onion-services",
+	"path": "#onionservices",
+	"control": "onionservices",
 	"label": "Onion Services"
     },
     "misc": {
diff --git a/ms_MY.json b/ms_MY.json
index 9e04edb9e..3f96dd58f 100644
--- a/ms_MY.json
+++ b/ms_MY.json
@@ -5,18 +5,18 @@
 	"label": "Most Frequently Asked Questions"
     },
     "tbb": {
-	"path": "#tor-browser",
-	"control": "tor-browser",
+	"path": "#tbb",
+	"control": "tbb",
 	"label": "Pelayar Tor"
     },
     "tormessenger": {
-	"path": "#tor-messenger",
-	"control": "tor-messenger",
+	"path": "#tormessenger",
+	"control": "tormessenger",
 	"label": "Tor Messenger"
     },
     "tormobile": {
-	"path": "#tor-mobile",
-	"control": "tor-mobile",
+	"path": "#tormobile",
+	"control": "tormobile",
 	"label": "Tor Mobile"
     },
     "gettor": {
@@ -25,8 +25,8 @@
 	"label": "GetTor"
     },
     "connecting": {
-	"path": "#connecting-to-tor",
-	"control": "connecting-to-tor",
+	"path": "#connectingtotor",
+	"control": "connectingtotor",
 	"label": "Connecting To Tor"
     },
     "censorship": {
@@ -45,8 +45,8 @@
 	"label": "Operators"
     },
     "onionservices": {
-	"path": "#onion-services",
-	"control": "onion-services",
+	"path": "#onionservices",
+	"control": "onionservices",
 	"label": "Onion Services"
     },
     "misc": {
diff --git a/mt.json b/mt.json
index 7b9006505..63a46e0ca 100644
--- a/mt.json
+++ b/mt.json
@@ -5,18 +5,18 @@
 	"label": "Most Frequently Asked Questions"
     },
     "tbb": {
-	"path": "#tor-browser",
-	"control": "tor-browser",
+	"path": "#tbb",
+	"control": "tbb",
 	"label": "Tor Browser"
     },
     "tormessenger": {
-	"path": "#tor-messenger",
-	"control": "tor-messenger",
+	"path": "#tormessenger",
+	"control": "tormessenger",
 	"label": "Tor Messenger"
     },
     "tormobile": {
-	"path": "#tor-mobile",
-	"control": "tor-mobile",
+	"path": "#tormobile",
+	"control": "tormobile",
 	"label": "Tor Mobile"
     },
     "gettor": {
@@ -25,8 +25,8 @@
 	"label": "GetTor"
     },
     "connecting": {
-	"path": "#connecting-to-tor",
-	"control": "connecting-to-tor",
+	"path": "#connectingtotor",
+	"control": "connectingtotor",
 	"label": "Connecting To Tor"
     },
     "censorship": {
@@ -45,8 +45,8 @@
 	"label": "Operators"
     },
     "onionservices": {
-	"path": "#onion-services",
-	"control": "onion-services",
+	"path": "#onionservices",
+	"control": "onionservices",
 	"label": "Onion Services"
     },
     "misc": {
diff --git a/my.json b/my.json
index d95f547a1..baaf56bfe 100644
--- a/my.json
+++ b/my.json
@@ -5,18 +5,18 @@
 	"label": "Most Frequently Asked Questions"
     },
     "tbb": {
-	"path": "#tor-browser",
-	"control": "tor-browser",
+	"path": "#tbb",
+	"control": "tbb",
 	"label": "Tor Browser"
     },
     "tormessenger": {
-	"path": "#tor-messenger",
-	"control": "tor-messenger",
+	"path": "#tormessenger",
+	"control": "tormessenger",
 	"label": "Tor Messenger"
     },
     "tormobile": {
-	"path": "#tor-mobile",
-	"control": "tor-mobile",
+	"path": "#tormobile",
+	"control": "tormobile",
 	"label": "Tor Mobile"
     },
     "gettor": {
@@ -25,8 +25,8 @@
 	"label": "GetTor"
     },
     "connecting": {
-	"path": "#connecting-to-tor",
-	"control": "connecting-to-tor",
+	"path": "#connectingtotor",
+	"control": "connectingtotor",
 	"label": "Connecting To Tor"
     },
     "censorship": {
@@ -45,8 +45,8 @@
 	"label": "Operators"
     },
     "onionservices": {
-	"path": "#onion-services",
-	"control": "onion-services",
+	"path": "#onionservices",
+	"control": "onionservices",
 	"label": "Onion Services"
     },
     "misc": {
diff --git a/nah.json b/nah.json
index 7b9006505..63a46e0ca 100644
--- a/nah.json
+++ b/nah.json
@@ -5,18 +5,18 @@
 	"label": "Most Frequently Asked Questions"
     },
     "tbb": {
-	"path": "#tor-browser",
-	"control": "tor-browser",
+	"path": "#tbb",
+	"control": "tbb",
 	"label": "Tor Browser"
     },
     "tormessenger": {
-	"path": "#tor-messenger",
-	"control": "tor-messenger",
+	"path": "#tormessenger",
+	"control": "tormessenger",
 	"label": "Tor Messenger"
     },
     "tormobile": {
-	"path": "#tor-mobile",
-	"control": "tor-mobile",
+	"path": "#tormobile",
+	"control": "tormobile",
 	"label": "Tor Mobile"
     },
     "gettor": {
@@ -25,8 +25,8 @@
 	"label": "GetTor"
     },
     "connecting": {
-	"path": "#connecting-to-tor",
-	"control": "connecting-to-tor",
+	"path": "#connectingtotor",
+	"control": "connectingtotor",
 	"label": "Connecting To Tor"
     },
     "censorship": {
@@ -45,8 +45,8 @@
 	"label": "Operators"
     },
     "onionservices": {
-	"path": "#onion-services",
-	"control": "onion-services",
+	"path": "#onionservices",
+	"control": "onionservices",
 	"label": "Onion Services"
     },
     "misc": {
diff --git a/nap.json b/nap.json
index 7b9006505..63a46e0ca 100644
--- a/nap.json
+++ b/nap.json
@@ -5,18 +5,18 @@
 	"label": "Most Frequently Asked Questions"
     },
     "tbb": {
-	"path": "#tor-browser",
-	"control": "tor-browser",
+	"path": "#tbb",
+	"control": "tbb",
 	"label": "Tor Browser"
     },
     "tormessenger": {
-	"path": "#tor-messenger",
-	"control": "tor-messenger",
+	"path": "#tormessenger",
+	"control": "tormessenger",
 	"label": "Tor Messenger"
     },
     "tormobile": {
-	"path": "#tor-mobile",
-	"control": "tor-mobile",
+	"path": "#tormobile",
+	"control": "tormobile",
 	"label": "Tor Mobile"
     },
     "gettor": {
@@ -25,8 +25,8 @@
 	"label": "GetTor"
     },
     "connecting": {
-	"path": "#connecting-to-tor",
-	"control": "connecting-to-tor",
+	"path": "#connectingtotor",
+	"control": "connectingtotor",
 	"label": "Connecting To Tor"
     },
     "censorship": {
@@ -45,8 +45,8 @@
 	"label": "Operators"
     },
     "onionservices": {
-	"path": "#onion-services",
-	"control": "onion-services",
+	"path": "#onionservices",
+	"control": "onionservices",
 	"label": "Onion Services"
     },
     "misc": {
diff --git a/nb.json b/nb.json
index 1e2a75488..ce0dc7d2e 100644
--- a/nb.json
+++ b/nb.json
@@ -5,18 +5,18 @@
 	"label": "Oftest stilte spørsmål"
     },
     "tbb": {
-	"path": "#tor-browser",
-	"control": "tor-browser",
+	"path": "#tbb",
+	"control": "tbb",
 	"label": "Tor-nettleseren"
     },
     "tormessenger": {
-	"path": "#tor-messenger",
-	"control": "tor-messenger",
+	"path": "#tormessenger",
+	"control": "tormessenger",
 	"label": "Tor-messenger"
     },
     "tormobile": {
-	"path": "#tor-mobile",
-	"control": "tor-mobile",
+	"path": "#tormobile",
+	"control": "tormobile",
 	"label": "Tor Mobile"
     },
     "gettor": {
@@ -25,8 +25,8 @@
 	"label": "GetTor"
     },
     "connecting": {
-	"path": "#connecting-to-tor",
-	"control": "connecting-to-tor",
+	"path": "#connectingtotor",
+	"control": "connectingtotor",
 	"label": "Connecting To Tor"
     },
     "censorship": {
@@ -45,8 +45,8 @@
 	"label": "Operators"
     },
     "onionservices": {
-	"path": "#onion-services",
-	"control": "onion-services",
+	"path": "#onionservices",
+	"control": "onionservices",
 	"label": "Løk-tjenester"
     },
     "misc": {
diff --git a/ne.json b/ne.json
index 7b9006505..63a46e0ca 100644
--- a/ne.json
+++ b/ne.json
@@ -5,18 +5,18 @@
 	"label": "Most Frequently Asked Questions"
     },
     "tbb": {
-	"path": "#tor-browser",
-	"control": "tor-browser",
+	"path": "#tbb",
+	"control": "tbb",
 	"label": "Tor Browser"
     },
     "tormessenger": {
-	"path": "#tor-messenger",
-	"control": "tor-messenger",
+	"path": "#tormessenger",
+	"control": "tormessenger",
 	"label": "Tor Messenger"
     },
     "tormobile": {
-	"path": "#tor-mobile",
-	"control": "tor-mobile",
+	"path": "#tormobile",
+	"control": "tormobile",
 	"label": "Tor Mobile"
     },
     "gettor": {
@@ -25,8 +25,8 @@
 	"label": "GetTor"
     },
     "connecting": {
-	"path": "#connecting-to-tor",
-	"control": "connecting-to-tor",
+	"path": "#connectingtotor",
+	"control": "connectingtotor",
 	"label": "Connecting To Tor"
     },
     "censorship": {
@@ -45,8 +45,8 @@
 	"label": "Operators"
     },
     "onionservices": {
-	"path": "#onion-services",
-	"control": "onion-services",
+	"path": "#onionservices",
+	"control": "onionservices",
 	"label": "Onion Services"
     },
     "misc": {
diff --git a/nl.json b/nl.json
index 793f7fc5e..51328fdc1 100644
--- a/nl.json
+++ b/nl.json
@@ -5,18 +5,18 @@
 	"label": "Most Frequently Asked Questions"
     },
     "tbb": {
-	"path": "#tor-browser",
-	"control": "tor-browser",
+	"path": "#tbb",
+	"control": "tbb",
 	"label": "Tor-browser"
     },
     "tormessenger": {
-	"path": "#tor-messenger",
-	"control": "tor-messenger",
+	"path": "#tormessenger",
+	"control": "tormessenger",
 	"label": "Tor Messenger"
     },
     "tormobile": {
-	"path": "#tor-mobile",
-	"control": "tor-mobile",
+	"path": "#tormobile",
+	"control": "tormobile",
 	"label": "Tor Mobile"
     },
     "gettor": {
@@ -25,8 +25,8 @@
 	"label": "GetTor"
     },
     "connecting": {
-	"path": "#connecting-to-tor",
-	"control": "connecting-to-tor",
+	"path": "#connectingtotor",
+	"control": "connectingtotor",
 	"label": "Connecting To Tor"
     },
     "censorship": {
@@ -45,8 +45,8 @@
 	"label": "Operators"
     },
     "onionservices": {
-	"path": "#onion-services",
-	"control": "onion-services",
+	"path": "#onionservices",
+	"control": "onionservices",
 	"label": "Onion Services"
     },
     "misc": {
diff --git a/nl_BE.json b/nl_BE.json
index 7b9006505..63a46e0ca 100644
--- a/nl_BE.json
+++ b/nl_BE.json
@@ -5,18 +5,18 @@
 	"label": "Most Frequently Asked Questions"
     },
     "tbb": {
-	"path": "#tor-browser",
-	"control": "tor-browser",
+	"path": "#tbb",
+	"control": "tbb",
 	"label": "Tor Browser"
     },
     "tormessenger": {
-	"path": "#tor-messenger",
-	"control": "tor-messenger",
+	"path": "#tormessenger",
+	"control": "tormessenger",
 	"label": "Tor Messenger"
     },
     "tormobile": {
-	"path": "#tor-mobile",
-	"control": "tor-mobile",
+	"path": "#tormobile",
+	"control": "tormobile",
 	"label": "Tor Mobile"
     },
     "gettor": {
@@ -25,8 +25,8 @@
 	"label": "GetTor"
     },
     "connecting": {
-	"path": "#connecting-to-tor",
-	"control": "connecting-to-tor",
+	"path": "#connectingtotor",
+	"control": "connectingtotor",
 	"label": "Connecting To Tor"
     },
     "censorship": {
@@ -45,8 +45,8 @@
 	"label": "Operators"
     },
     "onionservices": {
-	"path": "#onion-services",
-	"control": "onion-services",
+	"path": "#onionservices",
+	"control": "onionservices",
 	"label": "Onion Services"
     },
     "misc": {
diff --git a/nn.json b/nn.json
index 2e504758c..0f83b4ed5 100644
--- a/nn.json
+++ b/nn.json
@@ -5,18 +5,18 @@
 	"label": "Most Frequently Asked Questions"
     },
     "tbb": {
-	"path": "#tor-browser",
-	"control": "tor-browser",
+	"path": "#tbb",
+	"control": "tbb",
 	"label": "Tor-nettlesar"
     },
     "tormessenger": {
-	"path": "#tor-messenger",
-	"control": "tor-messenger",
+	"path": "#tormessenger",
+	"control": "tormessenger",
 	"label": "Tor Messenger"
     },
     "tormobile": {
-	"path": "#tor-mobile",
-	"control": "tor-mobile",
+	"path": "#tormobile",
+	"control": "tormobile",
 	"label": "Tor Mobile"
     },
     "gettor": {
@@ -25,8 +25,8 @@
 	"label": "GetTor"
     },
     "connecting": {
-	"path": "#connecting-to-tor",
-	"control": "connecting-to-tor",
+	"path": "#connectingtotor",
+	"control": "connectingtotor",
 	"label": "Connecting To Tor"
     },
     "censorship": {
@@ -45,8 +45,8 @@
 	"label": "Operators"
     },
     "onionservices": {
-	"path": "#onion-services",
-	"control": "onion-services",
+	"path": "#onionservices",
+	"control": "onionservices",
 	"label": "Onion-tenester"
     },
     "misc": {
diff --git a/nso.json b/nso.json
index 7b9006505..63a46e0ca 100644
--- a/nso.json
+++ b/nso.json
@@ -5,18 +5,18 @@
 	"label": "Most Frequently Asked Questions"
     },
     "tbb": {
-	"path": "#tor-browser",
-	"control": "tor-browser",
+	"path": "#tbb",
+	"control": "tbb",
 	"label": "Tor Browser"
     },
     "tormessenger": {
-	"path": "#tor-messenger",
-	"control": "tor-messenger",
+	"path": "#tormessenger",
+	"control": "tormessenger",
 	"label": "Tor Messenger"
     },
     "tormobile": {
-	"path": "#tor-mobile",
-	"control": "tor-mobile",
+	"path": "#tormobile",
+	"control": "tormobile",
 	"label": "Tor Mobile"
     },
     "gettor": {
@@ -25,8 +25,8 @@
 	"label": "GetTor"
     },
     "connecting": {
-	"path": "#connecting-to-tor",
-	"control": "connecting-to-tor",
+	"path": "#connectingtotor",
+	"control": "connectingtotor",
 	"label": "Connecting To Tor"
     },
     "censorship": {
@@ -45,8 +45,8 @@
 	"label": "Operators"
     },
     "onionservices": {
-	"path": "#onion-services",
-	"control": "onion-services",
+	"path": "#onionservices",
+	"control": "onionservices",
 	"label": "Onion Services"
     },
     "misc": {
diff --git a/oc.json b/oc.json
index 7b9006505..63a46e0ca 100644
--- a/oc.json
+++ b/oc.json
@@ -5,18 +5,18 @@
 	"label": "Most Frequently Asked Questions"
     },
     "tbb": {
-	"path": "#tor-browser",
-	"control": "tor-browser",
+	"path": "#tbb",
+	"control": "tbb",
 	"label": "Tor Browser"
     },
     "tormessenger": {
-	"path": "#tor-messenger",
-	"control": "tor-messenger",
+	"path": "#tormessenger",
+	"control": "tormessenger",
 	"label": "Tor Messenger"
     },
     "tormobile": {
-	"path": "#tor-mobile",
-	"control": "tor-mobile",
+	"path": "#tormobile",
+	"control": "tormobile",
 	"label": "Tor Mobile"
     },
     "gettor": {
@@ -25,8 +25,8 @@
 	"label": "GetTor"
     },
     "connecting": {
-	"path": "#connecting-to-tor",
-	"control": "connecting-to-tor",
+	"path": "#connectingtotor",
+	"control": "connectingtotor",
 	"label": "Connecting To Tor"
     },
     "censorship": {
@@ -45,8 +45,8 @@
 	"label": "Operators"
     },
     "onionservices": {
-	"path": "#onion-services",
-	"control": "onion-services",
+	"path": "#onionservices",
+	"control": "onionservices",
 	"label": "Onion Services"
     },
     "misc": {
diff --git a/om.json b/om.json
index 7b9006505..63a46e0ca 100644
--- a/om.json
+++ b/om.json
@@ -5,18 +5,18 @@
 	"label": "Most Frequently Asked Questions"
     },
     "tbb": {
-	"path": "#tor-browser",
-	"control": "tor-browser",
+	"path": "#tbb",
+	"control": "tbb",
 	"label": "Tor Browser"
     },
     "tormessenger": {
-	"path": "#tor-messenger",
-	"control": "tor-messenger",
+	"path": "#tormessenger",
+	"control": "tormessenger",
 	"label": "Tor Messenger"
     },
     "tormobile": {
-	"path": "#tor-mobile",
-	"control": "tor-mobile",
+	"path": "#tormobile",
+	"control": "tormobile",
 	"label": "Tor Mobile"
     },
     "gettor": {
@@ -25,8 +25,8 @@
 	"label": "GetTor"
     },
     "connecting": {
-	"path": "#connecting-to-tor",
-	"control": "connecting-to-tor",
+	"path": "#connectingtotor",
+	"control": "connectingtotor",
 	"label": "Connecting To Tor"
     },
     "censorship": {
@@ -45,8 +45,8 @@
 	"label": "Operators"
     },
     "onionservices": {
-	"path": "#onion-services",
-	"control": "onion-services",
+	"path": "#onionservices",
+	"control": "onionservices",
 	"label": "Onion Services"
     },
     "misc": {
diff --git a/or.json b/or.json
index 7b9006505..63a46e0ca 100644
--- a/or.json
+++ b/or.json
@@ -5,18 +5,18 @@
 	"label": "Most Frequently Asked Questions"
     },
     "tbb": {
-	"path": "#tor-browser",
-	"control": "tor-browser",
+	"path": "#tbb",
+	"control": "tbb",
 	"label": "Tor Browser"
     },
     "tormessenger": {
-	"path": "#tor-messenger",
-	"control": "tor-messenger",
+	"path": "#tormessenger",
+	"control": "tormessenger",
 	"label": "Tor Messenger"
     },
     "tormobile": {
-	"path": "#tor-mobile",
-	"control": "tor-mobile",
+	"path": "#tormobile",
+	"control": "tormobile",
 	"label": "Tor Mobile"
     },
     "gettor": {
@@ -25,8 +25,8 @@
 	"label": "GetTor"
     },
     "connecting": {
-	"path": "#connecting-to-tor",
-	"control": "connecting-to-tor",
+	"path": "#connectingtotor",
+	"control": "connectingtotor",
 	"label": "Connecting To Tor"
     },
     "censorship": {
@@ -45,8 +45,8 @@
 	"label": "Operators"
     },
     "onionservices": {
-	"path": "#onion-services",
-	"control": "onion-services",
+	"path": "#onionservices",
+	"control": "onionservices",
 	"label": "Onion Services"
     },
     "misc": {
diff --git a/pa.json b/pa.json
index 7e8c4d839..b3b01422d 100644
--- a/pa.json
+++ b/pa.json
@@ -5,18 +5,18 @@
 	"label": "Most Frequently Asked Questions"
     },
     "tbb": {
-	"path": "#tor-browser",
-	"control": "tor-browser",
+	"path": "#tbb",
+	"control": "tbb",
 	"label": "��ਰ ਬਰਾ��ਰ"
     },
     "tormessenger": {
-	"path": "#tor-messenger",
-	"control": "tor-messenger",
+	"path": "#tormessenger",
+	"control": "tormessenger",
 	"label": "Tor Messenger"
     },
     "tormobile": {
-	"path": "#tor-mobile",
-	"control": "tor-mobile",
+	"path": "#tormobile",
+	"control": "tormobile",
 	"label": "Tor Mobile"
     },
     "gettor": {
@@ -25,8 +25,8 @@
 	"label": "GetTor"
     },
     "connecting": {
-	"path": "#connecting-to-tor",
-	"control": "connecting-to-tor",
+	"path": "#connectingtotor",
+	"control": "connectingtotor",
 	"label": "Connecting To Tor"
     },
     "censorship": {
@@ -45,8 +45,8 @@
 	"label": "Operators"
     },
     "onionservices": {
-	"path": "#onion-services",
-	"control": "onion-services",
+	"path": "#onionservices",
+	"control": "onionservices",
 	"label": "Onion Services"
     },
     "misc": {
diff --git a/pap.json b/pap.json
index 7b9006505..63a46e0ca 100644
--- a/pap.json
+++ b/pap.json
@@ -5,18 +5,18 @@
 	"label": "Most Frequently Asked Questions"
     },
     "tbb": {
-	"path": "#tor-browser",
-	"control": "tor-browser",
+	"path": "#tbb",
+	"control": "tbb",
 	"label": "Tor Browser"
     },
     "tormessenger": {
-	"path": "#tor-messenger",
-	"control": "tor-messenger",
+	"path": "#tormessenger",
+	"control": "tormessenger",
 	"label": "Tor Messenger"
     },
     "tormobile": {
-	"path": "#tor-mobile",
-	"control": "tor-mobile",
+	"path": "#tormobile",
+	"control": "tormobile",
 	"label": "Tor Mobile"
     },
     "gettor": {
@@ -25,8 +25,8 @@
 	"label": "GetTor"
     },
     "connecting": {
-	"path": "#connecting-to-tor",
-	"control": "connecting-to-tor",
+	"path": "#connectingtotor",
+	"control": "connectingtotor",
 	"label": "Connecting To Tor"
     },
     "censorship": {
@@ -45,8 +45,8 @@
 	"label": "Operators"
     },
     "onionservices": {
-	"path": "#onion-services",
-	"control": "onion-services",
+	"path": "#onionservices",
+	"control": "onionservices",
 	"label": "Onion Services"
     },
     "misc": {
diff --git a/pl.json b/pl.json
index 6f8a2f6d9..37f254eb2 100644
--- a/pl.json
+++ b/pl.json
@@ -5,18 +5,18 @@
 	"label": "Most Frequently Asked Questions"
     },
     "tbb": {
-	"path": "#tor-browser",
-	"control": "tor-browser",
+	"path": "#tbb",
+	"control": "tbb",
 	"label": "PrzeglÄ?darka Tor"
     },
     "tormessenger": {
-	"path": "#tor-messenger",
-	"control": "tor-messenger",
+	"path": "#tormessenger",
+	"control": "tormessenger",
 	"label": "Tor Messenger"
     },
     "tormobile": {
-	"path": "#tor-mobile",
-	"control": "tor-mobile",
+	"path": "#tormobile",
+	"control": "tormobile",
 	"label": "Tor Mobile"
     },
     "gettor": {
@@ -25,8 +25,8 @@
 	"label": "GetTor"
     },
     "connecting": {
-	"path": "#connecting-to-tor",
-	"control": "connecting-to-tor",
+	"path": "#connectingtotor",
+	"control": "connectingtotor",
 	"label": "Connecting To Tor"
     },
     "censorship": {
@@ -45,8 +45,8 @@
 	"label": "Operators"
     },
     "onionservices": {
-	"path": "#onion-services",
-	"control": "onion-services",
+	"path": "#onionservices",
+	"control": "onionservices",
 	"label": "UsÅ?ugi Tor"
     },
     "misc": {
diff --git a/pms.json b/pms.json
index 7b9006505..63a46e0ca 100644
--- a/pms.json
+++ b/pms.json
@@ -5,18 +5,18 @@
 	"label": "Most Frequently Asked Questions"
     },
     "tbb": {
-	"path": "#tor-browser",
-	"control": "tor-browser",
+	"path": "#tbb",
+	"control": "tbb",
 	"label": "Tor Browser"
     },
     "tormessenger": {
-	"path": "#tor-messenger",
-	"control": "tor-messenger",
+	"path": "#tormessenger",
+	"control": "tormessenger",
 	"label": "Tor Messenger"
     },
     "tormobile": {
-	"path": "#tor-mobile",
-	"control": "tor-mobile",
+	"path": "#tormobile",
+	"control": "tormobile",
 	"label": "Tor Mobile"
     },
     "gettor": {
@@ -25,8 +25,8 @@
 	"label": "GetTor"
     },
     "connecting": {
-	"path": "#connecting-to-tor",
-	"control": "connecting-to-tor",
+	"path": "#connectingtotor",
+	"control": "connectingtotor",
 	"label": "Connecting To Tor"
     },
     "censorship": {
@@ -45,8 +45,8 @@
 	"label": "Operators"
     },
     "onionservices": {
-	"path": "#onion-services",
-	"control": "onion-services",
+	"path": "#onionservices",
+	"control": "onionservices",
 	"label": "Onion Services"
     },
     "misc": {
diff --git a/ps.json b/ps.json
index 7b9006505..63a46e0ca 100644
--- a/ps.json
+++ b/ps.json
@@ -5,18 +5,18 @@
 	"label": "Most Frequently Asked Questions"
     },
     "tbb": {
-	"path": "#tor-browser",
-	"control": "tor-browser",
+	"path": "#tbb",
+	"control": "tbb",
 	"label": "Tor Browser"
     },
     "tormessenger": {
-	"path": "#tor-messenger",
-	"control": "tor-messenger",
+	"path": "#tormessenger",
+	"control": "tormessenger",
 	"label": "Tor Messenger"
     },
     "tormobile": {
-	"path": "#tor-mobile",
-	"control": "tor-mobile",
+	"path": "#tormobile",
+	"control": "tormobile",
 	"label": "Tor Mobile"
     },
     "gettor": {
@@ -25,8 +25,8 @@
 	"label": "GetTor"
     },
     "connecting": {
-	"path": "#connecting-to-tor",
-	"control": "connecting-to-tor",
+	"path": "#connectingtotor",
+	"control": "connectingtotor",
 	"label": "Connecting To Tor"
     },
     "censorship": {
@@ -45,8 +45,8 @@
 	"label": "Operators"
     },
     "onionservices": {
-	"path": "#onion-services",
-	"control": "onion-services",
+	"path": "#onionservices",
+	"control": "onionservices",
 	"label": "Onion Services"
     },
     "misc": {
diff --git a/pt.json b/pt.json
index 41171af50..af01b261c 100644
--- a/pt.json
+++ b/pt.json
@@ -5,18 +5,18 @@
 	"label": "As Perguntas Mais Frequentes"
     },
     "tbb": {
-	"path": "#tor-browser",
-	"control": "tor-browser",
+	"path": "#tbb",
+	"control": "tbb",
 	"label": "Tor Browser"
     },
     "tormessenger": {
-	"path": "#tor-messenger",
-	"control": "tor-messenger",
+	"path": "#tormessenger",
+	"control": "tormessenger",
 	"label": "Tor Messenger"
     },
     "tormobile": {
-	"path": "#tor-mobile",
-	"control": "tor-mobile",
+	"path": "#tormobile",
+	"control": "tormobile",
 	"label": "Tor Mobile"
     },
     "gettor": {
@@ -25,8 +25,8 @@
 	"label": "GetTor"
     },
     "connecting": {
-	"path": "#connecting-to-tor",
-	"control": "connecting-to-tor",
+	"path": "#connectingtotor",
+	"control": "connectingtotor",
 	"label": "Connecting To Tor"
     },
     "censorship": {
@@ -45,8 +45,8 @@
 	"label": "Operators"
     },
     "onionservices": {
-	"path": "#onion-services",
-	"control": "onion-services",
+	"path": "#onionservices",
+	"control": "onionservices",
 	"label": "Serviços da Cebola"
     },
     "misc": {
diff --git a/pt_BR.json b/pt_BR.json
index fac7cb337..ae41bac9a 100644
--- a/pt_BR.json
+++ b/pt_BR.json
@@ -5,18 +5,18 @@
 	"label": "Perguntas Frequentes"
     },
     "tbb": {
-	"path": "#tor-browser",
-	"control": "tor-browser",
+	"path": "#tbb",
+	"control": "tbb",
 	"label": "Navegador Tor"
     },
     "tormessenger": {
-	"path": "#tor-messenger",
-	"control": "tor-messenger",
+	"path": "#tormessenger",
+	"control": "tormessenger",
 	"label": "Tor Messenger"
     },
     "tormobile": {
-	"path": "#tor-mobile",
-	"control": "tor-mobile",
+	"path": "#tormobile",
+	"control": "tormobile",
 	"label": "Tor Mobile"
     },
     "gettor": {
@@ -25,8 +25,8 @@
 	"label": "GetTor"
     },
     "connecting": {
-	"path": "#connecting-to-tor",
-	"control": "connecting-to-tor",
+	"path": "#connectingtotor",
+	"control": "connectingtotor",
 	"label": "Connecting To Tor"
     },
     "censorship": {
@@ -45,8 +45,8 @@
 	"label": "Operators"
     },
     "onionservices": {
-	"path": "#onion-services",
-	"control": "onion-services",
+	"path": "#onionservices",
+	"control": "onionservices",
 	"label": "Serviços Onion"
     },
     "misc": {
diff --git a/ro.json b/ro.json
index f03011dcb..161cfa57e 100644
--- a/ro.json
+++ b/ro.json
@@ -5,18 +5,18 @@
 	"label": "Most Frequently Asked Questions"
     },
     "tbb": {
-	"path": "#tor-browser",
-	"control": "tor-browser",
+	"path": "#tbb",
+	"control": "tbb",
 	"label": "Tor Browser"
     },
     "tormessenger": {
-	"path": "#tor-messenger",
-	"control": "tor-messenger",
+	"path": "#tormessenger",
+	"control": "tormessenger",
 	"label": "Tor Messenger"
     },
     "tormobile": {
-	"path": "#tor-mobile",
-	"control": "tor-mobile",
+	"path": "#tormobile",
+	"control": "tormobile",
 	"label": "Tor Mobile"
     },
     "gettor": {
@@ -25,8 +25,8 @@
 	"label": "GetTor"
     },
     "connecting": {
-	"path": "#connecting-to-tor",
-	"control": "connecting-to-tor",
+	"path": "#connectingtotor",
+	"control": "connectingtotor",
 	"label": "Connecting To Tor"
     },
     "censorship": {
@@ -45,8 +45,8 @@
 	"label": "Operators"
     },
     "onionservices": {
-	"path": "#onion-services",
-	"control": "onion-services",
+	"path": "#onionservices",
+	"control": "onionservices",
 	"label": "Servicii Onion"
     },
     "misc": {
diff --git a/ru.json b/ru.json
index 4499da32b..241e05ea5 100644
--- a/ru.json
+++ b/ru.json
@@ -5,18 +5,18 @@
 	"label": "Most Frequently Asked Questions"
     },
     "tbb": {
-	"path": "#tor-browser",
-	"control": "tor-browser",
+	"path": "#tbb",
+	"control": "tbb",
 	"label": "Ð?бозÑ?еваÑ?елÑ? Tor"
     },
     "tormessenger": {
-	"path": "#tor-messenger",
-	"control": "tor-messenger",
+	"path": "#tormessenger",
+	"control": "tormessenger",
 	"label": "Tor Messenger"
     },
     "tormobile": {
-	"path": "#tor-mobile",
-	"control": "tor-mobile",
+	"path": "#tormobile",
+	"control": "tormobile",
 	"label": "Tor Mobile"
     },
     "gettor": {
@@ -25,8 +25,8 @@
 	"label": "GetTor"
     },
     "connecting": {
-	"path": "#connecting-to-tor",
-	"control": "connecting-to-tor",
+	"path": "#connectingtotor",
+	"control": "connectingtotor",
 	"label": "Connecting To Tor"
     },
     "censorship": {
@@ -45,8 +45,8 @@
 	"label": "Operators"
     },
     "onionservices": {
-	"path": "#onion-services",
-	"control": "onion-services",
+	"path": "#onionservices",
+	"control": "onionservices",
 	"label": "Onion Ñ?еÑ?виÑ?Ñ?"
     },
     "misc": {
diff --git a/ru@xxxxxxxxxxxxx b/ru@xxxxxxxxxxxxx
index 7b9006505..63a46e0ca 100644
--- a/ru@xxxxxxxxxxxxx
+++ b/ru@xxxxxxxxxxxxx
@@ -5,18 +5,18 @@
 	"label": "Most Frequently Asked Questions"
     },
     "tbb": {
-	"path": "#tor-browser",
-	"control": "tor-browser",
+	"path": "#tbb",
+	"control": "tbb",
 	"label": "Tor Browser"
     },
     "tormessenger": {
-	"path": "#tor-messenger",
-	"control": "tor-messenger",
+	"path": "#tormessenger",
+	"control": "tormessenger",
 	"label": "Tor Messenger"
     },
     "tormobile": {
-	"path": "#tor-mobile",
-	"control": "tor-mobile",
+	"path": "#tormobile",
+	"control": "tormobile",
 	"label": "Tor Mobile"
     },
     "gettor": {
@@ -25,8 +25,8 @@
 	"label": "GetTor"
     },
     "connecting": {
-	"path": "#connecting-to-tor",
-	"control": "connecting-to-tor",
+	"path": "#connectingtotor",
+	"control": "connectingtotor",
 	"label": "Connecting To Tor"
     },
     "censorship": {
@@ -45,8 +45,8 @@
 	"label": "Operators"
     },
     "onionservices": {
-	"path": "#onion-services",
-	"control": "onion-services",
+	"path": "#onionservices",
+	"control": "onionservices",
 	"label": "Onion Services"
     },
     "misc": {
diff --git a/sco.json b/sco.json
index 7b9006505..63a46e0ca 100644
--- a/sco.json
+++ b/sco.json
@@ -5,18 +5,18 @@
 	"label": "Most Frequently Asked Questions"
     },
     "tbb": {
-	"path": "#tor-browser",
-	"control": "tor-browser",
+	"path": "#tbb",
+	"control": "tbb",
 	"label": "Tor Browser"
     },
     "tormessenger": {
-	"path": "#tor-messenger",
-	"control": "tor-messenger",
+	"path": "#tormessenger",
+	"control": "tormessenger",
 	"label": "Tor Messenger"
     },
     "tormobile": {
-	"path": "#tor-mobile",
-	"control": "tor-mobile",
+	"path": "#tormobile",
+	"control": "tormobile",
 	"label": "Tor Mobile"
     },
     "gettor": {
@@ -25,8 +25,8 @@
 	"label": "GetTor"
     },
     "connecting": {
-	"path": "#connecting-to-tor",
-	"control": "connecting-to-tor",
+	"path": "#connectingtotor",
+	"control": "connectingtotor",
 	"label": "Connecting To Tor"
     },
     "censorship": {
@@ -45,8 +45,8 @@
 	"label": "Operators"
     },
     "onionservices": {
-	"path": "#onion-services",
-	"control": "onion-services",
+	"path": "#onionservices",
+	"control": "onionservices",
 	"label": "Onion Services"
     },
     "misc": {
diff --git a/si_LK.json b/si_LK.json
index 3ce38357c..a9e9ee7bf 100644
--- a/si_LK.json
+++ b/si_LK.json
@@ -5,18 +5,18 @@
 	"label": "Most Frequently Asked Questions"
     },
     "tbb": {
-	"path": "#tor-browser",
-	"control": "tor-browser",
+	"path": "#tbb",
+	"control": "tbb",
 	"label": "Tor බà·?â??රà·?à·?à·?රය"
     },
     "tormessenger": {
-	"path": "#tor-messenger",
-	"control": "tor-messenger",
+	"path": "#tormessenger",
+	"control": "tormessenger",
 	"label": "Tor Messenger"
     },
     "tormobile": {
-	"path": "#tor-mobile",
-	"control": "tor-mobile",
+	"path": "#tormobile",
+	"control": "tormobile",
 	"label": "Tor Mobile"
     },
     "gettor": {
@@ -25,8 +25,8 @@
 	"label": "GetTor"
     },
     "connecting": {
-	"path": "#connecting-to-tor",
-	"control": "connecting-to-tor",
+	"path": "#connectingtotor",
+	"control": "connectingtotor",
 	"label": "Connecting To Tor"
     },
     "censorship": {
@@ -45,8 +45,8 @@
 	"label": "Operators"
     },
     "onionservices": {
-	"path": "#onion-services",
-	"control": "onion-services",
+	"path": "#onionservices",
+	"control": "onionservices",
 	"label": "Onion Services"
     },
     "misc": {
diff --git a/sk.json b/sk.json
index 2b9d9bddc..7e11dc01e 100644
--- a/sk.json
+++ b/sk.json
@@ -5,18 +5,18 @@
 	"label": "Most Frequently Asked Questions"
     },
     "tbb": {
-	"path": "#tor-browser",
-	"control": "tor-browser",
+	"path": "#tbb",
+	"control": "tbb",
 	"label": "PrehliadaÄ? Tor"
     },
     "tormessenger": {
-	"path": "#tor-messenger",
-	"control": "tor-messenger",
+	"path": "#tormessenger",
+	"control": "tormessenger",
 	"label": "Tor Messenger"
     },
     "tormobile": {
-	"path": "#tor-mobile",
-	"control": "tor-mobile",
+	"path": "#tormobile",
+	"control": "tormobile",
 	"label": "Tor Mobile"
     },
     "gettor": {
@@ -25,8 +25,8 @@
 	"label": "GetTor"
     },
     "connecting": {
-	"path": "#connecting-to-tor",
-	"control": "connecting-to-tor",
+	"path": "#connectingtotor",
+	"control": "connectingtotor",
 	"label": "Connecting To Tor"
     },
     "censorship": {
@@ -45,8 +45,8 @@
 	"label": "Operators"
     },
     "onionservices": {
-	"path": "#onion-services",
-	"control": "onion-services",
+	"path": "#onionservices",
+	"control": "onionservices",
 	"label": "Onion Services"
     },
     "misc": {
diff --git a/sk_SK.json b/sk_SK.json
index 13b2214dd..b772af4df 100644
--- a/sk_SK.json
+++ b/sk_SK.json
@@ -5,18 +5,18 @@
 	"label": "Most Frequently Asked Questions"
     },
     "tbb": {
-	"path": "#tor-browser",
-	"control": "tor-browser",
+	"path": "#tbb",
+	"control": "tbb",
 	"label": "Tor Browser"
     },
     "tormessenger": {
-	"path": "#tor-messenger",
-	"control": "tor-messenger",
+	"path": "#tormessenger",
+	"control": "tormessenger",
 	"label": "Tor Messenger"
     },
     "tormobile": {
-	"path": "#tor-mobile",
-	"control": "tor-mobile",
+	"path": "#tormobile",
+	"control": "tormobile",
 	"label": "Tor Mobile"
     },
     "gettor": {
@@ -25,8 +25,8 @@
 	"label": "GetTor"
     },
     "connecting": {
-	"path": "#connecting-to-tor",
-	"control": "connecting-to-tor",
+	"path": "#connectingtotor",
+	"control": "connectingtotor",
 	"label": "Connecting To Tor"
     },
     "censorship": {
@@ -45,8 +45,8 @@
 	"label": "Operators"
     },
     "onionservices": {
-	"path": "#onion-services",
-	"control": "onion-services",
+	"path": "#onionservices",
+	"control": "onionservices",
 	"label": "Onion Services"
     },
     "misc": {
diff --git a/sl.json b/sl.json
index 7b9006505..63a46e0ca 100644
--- a/sl.json
+++ b/sl.json
@@ -5,18 +5,18 @@
 	"label": "Most Frequently Asked Questions"
     },
     "tbb": {
-	"path": "#tor-browser",
-	"control": "tor-browser",
+	"path": "#tbb",
+	"control": "tbb",
 	"label": "Tor Browser"
     },
     "tormessenger": {
-	"path": "#tor-messenger",
-	"control": "tor-messenger",
+	"path": "#tormessenger",
+	"control": "tormessenger",
 	"label": "Tor Messenger"
     },
     "tormobile": {
-	"path": "#tor-mobile",
-	"control": "tor-mobile",
+	"path": "#tormobile",
+	"control": "tormobile",
 	"label": "Tor Mobile"
     },
     "gettor": {
@@ -25,8 +25,8 @@
 	"label": "GetTor"
     },
     "connecting": {
-	"path": "#connecting-to-tor",
-	"control": "connecting-to-tor",
+	"path": "#connectingtotor",
+	"control": "connectingtotor",
 	"label": "Connecting To Tor"
     },
     "censorship": {
@@ -45,8 +45,8 @@
 	"label": "Operators"
     },
     "onionservices": {
-	"path": "#onion-services",
-	"control": "onion-services",
+	"path": "#onionservices",
+	"control": "onionservices",
 	"label": "Onion Services"
     },
     "misc": {
diff --git a/sl_SI.json b/sl_SI.json
index 0cd2068d5..ea8808a4f 100644
--- a/sl_SI.json
+++ b/sl_SI.json
@@ -5,18 +5,18 @@
 	"label": "Most Frequently Asked Questions"
     },
     "tbb": {
-	"path": "#tor-browser",
-	"control": "tor-browser",
+	"path": "#tbb",
+	"control": "tbb",
 	"label": "Tor brskalnik"
     },
     "tormessenger": {
-	"path": "#tor-messenger",
-	"control": "tor-messenger",
+	"path": "#tormessenger",
+	"control": "tormessenger",
 	"label": "Tor Messenger"
     },
     "tormobile": {
-	"path": "#tor-mobile",
-	"control": "tor-mobile",
+	"path": "#tormobile",
+	"control": "tormobile",
 	"label": "Tor Mobile"
     },
     "gettor": {
@@ -25,8 +25,8 @@
 	"label": "GetTor"
     },
     "connecting": {
-	"path": "#connecting-to-tor",
-	"control": "connecting-to-tor",
+	"path": "#connectingtotor",
+	"control": "connectingtotor",
 	"label": "Connecting To Tor"
     },
     "censorship": {
@@ -45,8 +45,8 @@
 	"label": "Operators"
     },
     "onionservices": {
-	"path": "#onion-services",
-	"control": "onion-services",
+	"path": "#onionservices",
+	"control": "onionservices",
 	"label": "Onion Services"
     },
     "misc": {
diff --git a/sn.json b/sn.json
index 7b9006505..63a46e0ca 100644
--- a/sn.json
+++ b/sn.json
@@ -5,18 +5,18 @@
 	"label": "Most Frequently Asked Questions"
     },
     "tbb": {
-	"path": "#tor-browser",
-	"control": "tor-browser",
+	"path": "#tbb",
+	"control": "tbb",
 	"label": "Tor Browser"
     },
     "tormessenger": {
-	"path": "#tor-messenger",
-	"control": "tor-messenger",
+	"path": "#tormessenger",
+	"control": "tormessenger",
 	"label": "Tor Messenger"
     },
     "tormobile": {
-	"path": "#tor-mobile",
-	"control": "tor-mobile",
+	"path": "#tormobile",
+	"control": "tormobile",
 	"label": "Tor Mobile"
     },
     "gettor": {
@@ -25,8 +25,8 @@
 	"label": "GetTor"
     },
     "connecting": {
-	"path": "#connecting-to-tor",
-	"control": "connecting-to-tor",
+	"path": "#connectingtotor",
+	"control": "connectingtotor",
 	"label": "Connecting To Tor"
     },
     "censorship": {
@@ -45,8 +45,8 @@
 	"label": "Operators"
     },
     "onionservices": {
-	"path": "#onion-services",
-	"control": "onion-services",
+	"path": "#onionservices",
+	"control": "onionservices",
 	"label": "Onion Services"
     },
     "misc": {
diff --git a/so.json b/so.json
index 7b9006505..63a46e0ca 100644
--- a/so.json
+++ b/so.json
@@ -5,18 +5,18 @@
 	"label": "Most Frequently Asked Questions"
     },
     "tbb": {
-	"path": "#tor-browser",
-	"control": "tor-browser",
+	"path": "#tbb",
+	"control": "tbb",
 	"label": "Tor Browser"
     },
     "tormessenger": {
-	"path": "#tor-messenger",
-	"control": "tor-messenger",
+	"path": "#tormessenger",
+	"control": "tormessenger",
 	"label": "Tor Messenger"
     },
     "tormobile": {
-	"path": "#tor-mobile",
-	"control": "tor-mobile",
+	"path": "#tormobile",
+	"control": "tormobile",
 	"label": "Tor Mobile"
     },
     "gettor": {
@@ -25,8 +25,8 @@
 	"label": "GetTor"
     },
     "connecting": {
-	"path": "#connecting-to-tor",
-	"control": "connecting-to-tor",
+	"path": "#connectingtotor",
+	"control": "connectingtotor",
 	"label": "Connecting To Tor"
     },
     "censorship": {
@@ -45,8 +45,8 @@
 	"label": "Operators"
     },
     "onionservices": {
-	"path": "#onion-services",
-	"control": "onion-services",
+	"path": "#onionservices",
+	"control": "onionservices",
 	"label": "Onion Services"
     },
     "misc": {
diff --git a/son.json b/son.json
index 7b9006505..63a46e0ca 100644
--- a/son.json
+++ b/son.json
@@ -5,18 +5,18 @@
 	"label": "Most Frequently Asked Questions"
     },
     "tbb": {
-	"path": "#tor-browser",
-	"control": "tor-browser",
+	"path": "#tbb",
+	"control": "tbb",
 	"label": "Tor Browser"
     },
     "tormessenger": {
-	"path": "#tor-messenger",
-	"control": "tor-messenger",
+	"path": "#tormessenger",
+	"control": "tormessenger",
 	"label": "Tor Messenger"
     },
     "tormobile": {
-	"path": "#tor-mobile",
-	"control": "tor-mobile",
+	"path": "#tormobile",
+	"control": "tormobile",
 	"label": "Tor Mobile"
     },
     "gettor": {
@@ -25,8 +25,8 @@
 	"label": "GetTor"
     },
     "connecting": {
-	"path": "#connecting-to-tor",
-	"control": "connecting-to-tor",
+	"path": "#connectingtotor",
+	"control": "connectingtotor",
 	"label": "Connecting To Tor"
     },
     "censorship": {
@@ -45,8 +45,8 @@
 	"label": "Operators"
     },
     "onionservices": {
-	"path": "#onion-services",
-	"control": "onion-services",
+	"path": "#onionservices",
+	"control": "onionservices",
 	"label": "Onion Services"
     },
     "misc": {
diff --git a/sq.json b/sq.json
index 7b9006505..63a46e0ca 100644
--- a/sq.json
+++ b/sq.json
@@ -5,18 +5,18 @@
 	"label": "Most Frequently Asked Questions"
     },
     "tbb": {
-	"path": "#tor-browser",
-	"control": "tor-browser",
+	"path": "#tbb",
+	"control": "tbb",
 	"label": "Tor Browser"
     },
     "tormessenger": {
-	"path": "#tor-messenger",
-	"control": "tor-messenger",
+	"path": "#tormessenger",
+	"control": "tormessenger",
 	"label": "Tor Messenger"
     },
     "tormobile": {
-	"path": "#tor-mobile",
-	"control": "tor-mobile",
+	"path": "#tormobile",
+	"control": "tormobile",
 	"label": "Tor Mobile"
     },
     "gettor": {
@@ -25,8 +25,8 @@
 	"label": "GetTor"
     },
     "connecting": {
-	"path": "#connecting-to-tor",
-	"control": "connecting-to-tor",
+	"path": "#connectingtotor",
+	"control": "connectingtotor",
 	"label": "Connecting To Tor"
     },
     "censorship": {
@@ -45,8 +45,8 @@
 	"label": "Operators"
     },
     "onionservices": {
-	"path": "#onion-services",
-	"control": "onion-services",
+	"path": "#onionservices",
+	"control": "onionservices",
 	"label": "Onion Services"
     },
     "misc": {
diff --git a/sr.json b/sr.json
index 9bc487771..94511ded3 100644
--- a/sr.json
+++ b/sr.json
@@ -5,18 +5,18 @@
 	"label": "Most Frequently Asked Questions"
     },
     "tbb": {
-	"path": "#tor-browser",
-	"control": "tor-browser",
+	"path": "#tbb",
+	"control": "tbb",
 	"label": "Tor PretraživaÄ?"
     },
     "tormessenger": {
-	"path": "#tor-messenger",
-	"control": "tor-messenger",
+	"path": "#tormessenger",
+	"control": "tormessenger",
 	"label": "Tor Messenger"
     },
     "tormobile": {
-	"path": "#tor-mobile",
-	"control": "tor-mobile",
+	"path": "#tormobile",
+	"control": "tormobile",
 	"label": "Tor Mobile"
     },
     "gettor": {
@@ -25,8 +25,8 @@
 	"label": "GetTor"
     },
     "connecting": {
-	"path": "#connecting-to-tor",
-	"control": "connecting-to-tor",
+	"path": "#connectingtotor",
+	"control": "connectingtotor",
 	"label": "Connecting To Tor"
     },
     "censorship": {
@@ -45,8 +45,8 @@
 	"label": "Operators"
     },
     "onionservices": {
-	"path": "#onion-services",
-	"control": "onion-services",
+	"path": "#onionservices",
+	"control": "onionservices",
 	"label": "Onion Services"
     },
     "misc": {
diff --git a/sr@xxxxxxxxxx b/sr@xxxxxxxxxx
index 7b9006505..63a46e0ca 100644
--- a/sr@xxxxxxxxxx
+++ b/sr@xxxxxxxxxx
@@ -5,18 +5,18 @@
 	"label": "Most Frequently Asked Questions"
     },
     "tbb": {
-	"path": "#tor-browser",
-	"control": "tor-browser",
+	"path": "#tbb",
+	"control": "tbb",
 	"label": "Tor Browser"
     },
     "tormessenger": {
-	"path": "#tor-messenger",
-	"control": "tor-messenger",
+	"path": "#tormessenger",
+	"control": "tormessenger",
 	"label": "Tor Messenger"
     },
     "tormobile": {
-	"path": "#tor-mobile",
-	"control": "tor-mobile",
+	"path": "#tormobile",
+	"control": "tormobile",
 	"label": "Tor Mobile"
     },
     "gettor": {
@@ -25,8 +25,8 @@
 	"label": "GetTor"
     },
     "connecting": {
-	"path": "#connecting-to-tor",
-	"control": "connecting-to-tor",
+	"path": "#connectingtotor",
+	"control": "connectingtotor",
 	"label": "Connecting To Tor"
     },
     "censorship": {
@@ -45,8 +45,8 @@
 	"label": "Operators"
     },
     "onionservices": {
-	"path": "#onion-services",
-	"control": "onion-services",
+	"path": "#onionservices",
+	"control": "onionservices",
 	"label": "Onion Services"
     },
     "misc": {
diff --git a/st.json b/st.json
index 7b9006505..63a46e0ca 100644
--- a/st.json
+++ b/st.json
@@ -5,18 +5,18 @@
 	"label": "Most Frequently Asked Questions"
     },
     "tbb": {
-	"path": "#tor-browser",
-	"control": "tor-browser",
+	"path": "#tbb",
+	"control": "tbb",
 	"label": "Tor Browser"
     },
     "tormessenger": {
-	"path": "#tor-messenger",
-	"control": "tor-messenger",
+	"path": "#tormessenger",
+	"control": "tormessenger",
 	"label": "Tor Messenger"
     },
     "tormobile": {
-	"path": "#tor-mobile",
-	"control": "tor-mobile",
+	"path": "#tormobile",
+	"control": "tormobile",
 	"label": "Tor Mobile"
     },
     "gettor": {
@@ -25,8 +25,8 @@
 	"label": "GetTor"
     },
     "connecting": {
-	"path": "#connecting-to-tor",
-	"control": "connecting-to-tor",
+	"path": "#connectingtotor",
+	"control": "connectingtotor",
 	"label": "Connecting To Tor"
     },
     "censorship": {
@@ -45,8 +45,8 @@
 	"label": "Operators"
     },
     "onionservices": {
-	"path": "#onion-services",
-	"control": "onion-services",
+	"path": "#onionservices",
+	"control": "onionservices",
 	"label": "Onion Services"
     },
     "misc": {
diff --git a/su.json b/su.json
index 7b9006505..63a46e0ca 100644
--- a/su.json
+++ b/su.json
@@ -5,18 +5,18 @@
 	"label": "Most Frequently Asked Questions"
     },
     "tbb": {
-	"path": "#tor-browser",
-	"control": "tor-browser",
+	"path": "#tbb",
+	"control": "tbb",
 	"label": "Tor Browser"
     },
     "tormessenger": {
-	"path": "#tor-messenger",
-	"control": "tor-messenger",
+	"path": "#tormessenger",
+	"control": "tormessenger",
 	"label": "Tor Messenger"
     },
     "tormobile": {
-	"path": "#tor-mobile",
-	"control": "tor-mobile",
+	"path": "#tormobile",
+	"control": "tormobile",
 	"label": "Tor Mobile"
     },
     "gettor": {
@@ -25,8 +25,8 @@
 	"label": "GetTor"
     },
     "connecting": {
-	"path": "#connecting-to-tor",
-	"control": "connecting-to-tor",
+	"path": "#connectingtotor",
+	"control": "connectingtotor",
 	"label": "Connecting To Tor"
     },
     "censorship": {
@@ -45,8 +45,8 @@
 	"label": "Operators"
     },
     "onionservices": {
-	"path": "#onion-services",
-	"control": "onion-services",
+	"path": "#onionservices",
+	"control": "onionservices",
 	"label": "Onion Services"
     },
     "misc": {
diff --git a/support-topics.json b/support-topics.json
index 7b9006505..63a46e0ca 100644
--- a/support-topics.json
+++ b/support-topics.json
@@ -5,18 +5,18 @@
 	"label": "Most Frequently Asked Questions"
     },
     "tbb": {
-	"path": "#tor-browser",
-	"control": "tor-browser",
+	"path": "#tbb",
+	"control": "tbb",
 	"label": "Tor Browser"
     },
     "tormessenger": {
-	"path": "#tor-messenger",
-	"control": "tor-messenger",
+	"path": "#tormessenger",
+	"control": "tormessenger",
 	"label": "Tor Messenger"
     },
     "tormobile": {
-	"path": "#tor-mobile",
-	"control": "tor-mobile",
+	"path": "#tormobile",
+	"control": "tormobile",
 	"label": "Tor Mobile"
     },
     "gettor": {
@@ -25,8 +25,8 @@
 	"label": "GetTor"
     },
     "connecting": {
-	"path": "#connecting-to-tor",
-	"control": "connecting-to-tor",
+	"path": "#connectingtotor",
+	"control": "connectingtotor",
 	"label": "Connecting To Tor"
     },
     "censorship": {
@@ -45,8 +45,8 @@
 	"label": "Operators"
     },
     "onionservices": {
-	"path": "#onion-services",
-	"control": "onion-services",
+	"path": "#onionservices",
+	"control": "onionservices",
 	"label": "Onion Services"
     },
     "misc": {
diff --git a/sv.json b/sv.json
index 62b377cdd..b358dbc76 100644
--- a/sv.json
+++ b/sv.json
@@ -5,18 +5,18 @@
 	"label": "Most Frequently Asked Questions"
     },
     "tbb": {
-	"path": "#tor-browser",
-	"control": "tor-browser",
+	"path": "#tbb",
+	"control": "tbb",
 	"label": "Tor webbläsaren"
     },
     "tormessenger": {
-	"path": "#tor-messenger",
-	"control": "tor-messenger",
+	"path": "#tormessenger",
+	"control": "tormessenger",
 	"label": "Tor Messenger"
     },
     "tormobile": {
-	"path": "#tor-mobile",
-	"control": "tor-mobile",
+	"path": "#tormobile",
+	"control": "tormobile",
 	"label": "Tor Mobile"
     },
     "gettor": {
@@ -25,8 +25,8 @@
 	"label": "GetTor"
     },
     "connecting": {
-	"path": "#connecting-to-tor",
-	"control": "connecting-to-tor",
+	"path": "#connectingtotor",
+	"control": "connectingtotor",
 	"label": "Connecting To Tor"
     },
     "censorship": {
@@ -45,8 +45,8 @@
 	"label": "Operators"
     },
     "onionservices": {
-	"path": "#onion-services",
-	"control": "onion-services",
+	"path": "#onionservices",
+	"control": "onionservices",
 	"label": "Onion tjänster"
     },
     "misc": {
diff --git a/sw.json b/sw.json
index 7b9006505..63a46e0ca 100644
--- a/sw.json
+++ b/sw.json
@@ -5,18 +5,18 @@
 	"label": "Most Frequently Asked Questions"
     },
     "tbb": {
-	"path": "#tor-browser",
-	"control": "tor-browser",
+	"path": "#tbb",
+	"control": "tbb",
 	"label": "Tor Browser"
     },
     "tormessenger": {
-	"path": "#tor-messenger",
-	"control": "tor-messenger",
+	"path": "#tormessenger",
+	"control": "tormessenger",
 	"label": "Tor Messenger"
     },
     "tormobile": {
-	"path": "#tor-mobile",
-	"control": "tor-mobile",
+	"path": "#tormobile",
+	"control": "tormobile",
 	"label": "Tor Mobile"
     },
     "gettor": {
@@ -25,8 +25,8 @@
 	"label": "GetTor"
     },
     "connecting": {
-	"path": "#connecting-to-tor",
-	"control": "connecting-to-tor",
+	"path": "#connectingtotor",
+	"control": "connectingtotor",
 	"label": "Connecting To Tor"
     },
     "censorship": {
@@ -45,8 +45,8 @@
 	"label": "Operators"
     },
     "onionservices": {
-	"path": "#onion-services",
-	"control": "onion-services",
+	"path": "#onionservices",
+	"control": "onionservices",
 	"label": "Onion Services"
     },
     "misc": {
diff --git a/ta.json b/ta.json
index 5011e4744..5804ec62a 100644
--- a/ta.json
+++ b/ta.json
@@ -5,18 +5,18 @@
 	"label": "Most Frequently Asked Questions"
     },
     "tbb": {
-	"path": "#tor-browser",
-	"control": "tor-browser",
+	"path": "#tbb",
+	"control": "tbb",
 	"label": "Tor �லாவி"
     },
     "tormessenger": {
-	"path": "#tor-messenger",
-	"control": "tor-messenger",
+	"path": "#tormessenger",
+	"control": "tormessenger",
 	"label": "Tor Messenger"
     },
     "tormobile": {
-	"path": "#tor-mobile",
-	"control": "tor-mobile",
+	"path": "#tormobile",
+	"control": "tormobile",
 	"label": "Tor Mobile"
     },
     "gettor": {
@@ -25,8 +25,8 @@
 	"label": "GetTor"
     },
     "connecting": {
-	"path": "#connecting-to-tor",
-	"control": "connecting-to-tor",
+	"path": "#connectingtotor",
+	"control": "connectingtotor",
 	"label": "Connecting To Tor"
     },
     "censorship": {
@@ -45,8 +45,8 @@
 	"label": "Operators"
     },
     "onionservices": {
-	"path": "#onion-services",
-	"control": "onion-services",
+	"path": "#onionservices",
+	"control": "onionservices",
 	"label": "Onion Services"
     },
     "misc": {
diff --git a/te.json b/te.json
index 7b9006505..63a46e0ca 100644
--- a/te.json
+++ b/te.json
@@ -5,18 +5,18 @@
 	"label": "Most Frequently Asked Questions"
     },
     "tbb": {
-	"path": "#tor-browser",
-	"control": "tor-browser",
+	"path": "#tbb",
+	"control": "tbb",
 	"label": "Tor Browser"
     },
     "tormessenger": {
-	"path": "#tor-messenger",
-	"control": "tor-messenger",
+	"path": "#tormessenger",
+	"control": "tormessenger",
 	"label": "Tor Messenger"
     },
     "tormobile": {
-	"path": "#tor-mobile",
-	"control": "tor-mobile",
+	"path": "#tormobile",
+	"control": "tormobile",
 	"label": "Tor Mobile"
     },
     "gettor": {
@@ -25,8 +25,8 @@
 	"label": "GetTor"
     },
     "connecting": {
-	"path": "#connecting-to-tor",
-	"control": "connecting-to-tor",
+	"path": "#connectingtotor",
+	"control": "connectingtotor",
 	"label": "Connecting To Tor"
     },
     "censorship": {
@@ -45,8 +45,8 @@
 	"label": "Operators"
     },
     "onionservices": {
-	"path": "#onion-services",
-	"control": "onion-services",
+	"path": "#onionservices",
+	"control": "onionservices",
 	"label": "Onion Services"
     },
     "misc": {
diff --git a/tg.json b/tg.json
index d9d57c994..a27dfb64d 100644
--- a/tg.json
+++ b/tg.json
@@ -5,18 +5,18 @@
 	"label": "Most Frequently Asked Questions"
     },
     "tbb": {
-	"path": "#tor-browser",
-	"control": "tor-browser",
+	"path": "#tbb",
+	"control": "tbb",
 	"label": "Tor Browser"
     },
     "tormessenger": {
-	"path": "#tor-messenger",
-	"control": "tor-messenger",
+	"path": "#tormessenger",
+	"control": "tormessenger",
 	"label": "Tor Messenger"
     },
     "tormobile": {
-	"path": "#tor-mobile",
-	"control": "tor-mobile",
+	"path": "#tormobile",
+	"control": "tormobile",
 	"label": "Tor Mobile"
     },
     "gettor": {
@@ -25,8 +25,8 @@
 	"label": "GetTor"
     },
     "connecting": {
-	"path": "#connecting-to-tor",
-	"control": "connecting-to-tor",
+	"path": "#connectingtotor",
+	"control": "connectingtotor",
 	"label": "Connecting To Tor"
     },
     "censorship": {
@@ -45,8 +45,8 @@
 	"label": "Operators"
     },
     "onionservices": {
-	"path": "#onion-services",
-	"control": "onion-services",
+	"path": "#onionservices",
+	"control": "onionservices",
 	"label": "Onion Services"
     },
     "misc": {
diff --git a/th.json b/th.json
index 7b9006505..63a46e0ca 100644
--- a/th.json
+++ b/th.json
@@ -5,18 +5,18 @@
 	"label": "Most Frequently Asked Questions"
     },
     "tbb": {
-	"path": "#tor-browser",
-	"control": "tor-browser",
+	"path": "#tbb",
+	"control": "tbb",
 	"label": "Tor Browser"
     },
     "tormessenger": {
-	"path": "#tor-messenger",
-	"control": "tor-messenger",
+	"path": "#tormessenger",
+	"control": "tormessenger",
 	"label": "Tor Messenger"
     },
     "tormobile": {
-	"path": "#tor-mobile",
-	"control": "tor-mobile",
+	"path": "#tormobile",
+	"control": "tormobile",
 	"label": "Tor Mobile"
     },
     "gettor": {
@@ -25,8 +25,8 @@
 	"label": "GetTor"
     },
     "connecting": {
-	"path": "#connecting-to-tor",
-	"control": "connecting-to-tor",
+	"path": "#connectingtotor",
+	"control": "connectingtotor",
 	"label": "Connecting To Tor"
     },
     "censorship": {
@@ -45,8 +45,8 @@
 	"label": "Operators"
     },
     "onionservices": {
-	"path": "#onion-services",
-	"control": "onion-services",
+	"path": "#onionservices",
+	"control": "onionservices",
 	"label": "Onion Services"
     },
     "misc": {
diff --git a/ti.json b/ti.json
index 7b9006505..63a46e0ca 100644
--- a/ti.json
+++ b/ti.json
@@ -5,18 +5,18 @@
 	"label": "Most Frequently Asked Questions"
     },
     "tbb": {
-	"path": "#tor-browser",
-	"control": "tor-browser",
+	"path": "#tbb",
+	"control": "tbb",
 	"label": "Tor Browser"
     },
     "tormessenger": {
-	"path": "#tor-messenger",
-	"control": "tor-messenger",
+	"path": "#tormessenger",
+	"control": "tormessenger",
 	"label": "Tor Messenger"
     },
     "tormobile": {
-	"path": "#tor-mobile",
-	"control": "tor-mobile",
+	"path": "#tormobile",
+	"control": "tormobile",
 	"label": "Tor Mobile"
     },
     "gettor": {
@@ -25,8 +25,8 @@
 	"label": "GetTor"
     },
     "connecting": {
-	"path": "#connecting-to-tor",
-	"control": "connecting-to-tor",
+	"path": "#connectingtotor",
+	"control": "connectingtotor",
 	"label": "Connecting To Tor"
     },
     "censorship": {
@@ -45,8 +45,8 @@
 	"label": "Operators"
     },
     "onionservices": {
-	"path": "#onion-services",
-	"control": "onion-services",
+	"path": "#onionservices",
+	"control": "onionservices",
 	"label": "Onion Services"
     },
     "misc": {
diff --git a/tk.json b/tk.json
index b9b62171f..e954a7cd8 100644
--- a/tk.json
+++ b/tk.json
@@ -5,18 +5,18 @@
 	"label": "Most Frequently Asked Questions"
     },
     "tbb": {
-	"path": "#tor-browser",
-	"control": "tor-browser",
+	"path": "#tbb",
+	"control": "tbb",
 	"label": "Tor Browser"
     },
     "tormessenger": {
-	"path": "#tor-messenger",
-	"control": "tor-messenger",
+	"path": "#tormessenger",
+	"control": "tormessenger",
 	"label": "Tor Messenger"
     },
     "tormobile": {
-	"path": "#tor-mobile",
-	"control": "tor-mobile",
+	"path": "#tormobile",
+	"control": "tormobile",
 	"label": "Tor Mobile"
     },
     "gettor": {
@@ -25,8 +25,8 @@
 	"label": "GetTor"
     },
     "connecting": {
-	"path": "#connecting-to-tor",
-	"control": "connecting-to-tor",
+	"path": "#connectingtotor",
+	"control": "connectingtotor",
 	"label": "Connecting To Tor"
     },
     "censorship": {
@@ -45,8 +45,8 @@
 	"label": "Operators"
     },
     "onionservices": {
-	"path": "#onion-services",
-	"control": "onion-services",
+	"path": "#onionservices",
+	"control": "onionservices",
 	"label": "Onion Services"
     },
     "misc": {
diff --git a/tr.json b/tr.json
index d07583aec..267e05bfc 100644
--- a/tr.json
+++ b/tr.json
@@ -5,18 +5,18 @@
 	"label": "Most Frequently Asked Questions"
     },
     "tbb": {
-	"path": "#tor-browser",
-	"control": "tor-browser",
+	"path": "#tbb",
+	"control": "tbb",
 	"label": "Tor Browser"
     },
     "tormessenger": {
-	"path": "#tor-messenger",
-	"control": "tor-messenger",
+	"path": "#tormessenger",
+	"control": "tormessenger",
 	"label": "Tor Messenger"
     },
     "tormobile": {
-	"path": "#tor-mobile",
-	"control": "tor-mobile",
+	"path": "#tormobile",
+	"control": "tormobile",
 	"label": "Tor Mobile"
     },
     "gettor": {
@@ -25,8 +25,8 @@
 	"label": "GetTor"
     },
     "connecting": {
-	"path": "#connecting-to-tor",
-	"control": "connecting-to-tor",
+	"path": "#connectingtotor",
+	"control": "connectingtotor",
 	"label": "Connecting To Tor"
     },
     "censorship": {
@@ -45,8 +45,8 @@
 	"label": "Operators"
     },
     "onionservices": {
-	"path": "#onion-services",
-	"control": "onion-services",
+	"path": "#onionservices",
+	"control": "onionservices",
 	"label": "Onion Hizmetleri"
     },
     "misc": {
diff --git a/ug@xxxxxxxxx b/ug@xxxxxxxxx
index 7e861f66d..0030f4e24 100644
--- a/ug@xxxxxxxxx
+++ b/ug@xxxxxxxxx
@@ -5,18 +5,18 @@
 	"label": "Most Frequently Asked Questions"
     },
     "tbb": {
-	"path": "#tor-browser",
-	"control": "tor-browser",
+	"path": "#tbb",
+	"control": "tbb",
 	"label": "Ù?تصÙ?Ø­ تÙ?ر"
     },
     "tormessenger": {
-	"path": "#tor-messenger",
-	"control": "tor-messenger",
+	"path": "#tormessenger",
+	"control": "tormessenger",
 	"label": "Tor Messenger"
     },
     "tormobile": {
-	"path": "#tor-mobile",
-	"control": "tor-mobile",
+	"path": "#tormobile",
+	"control": "tormobile",
 	"label": "Tor Mobile"
     },
     "gettor": {
@@ -25,8 +25,8 @@
 	"label": "GetTor"
     },
     "connecting": {
-	"path": "#connecting-to-tor",
-	"control": "connecting-to-tor",
+	"path": "#connectingtotor",
+	"control": "connectingtotor",
 	"label": "Connecting To Tor"
     },
     "censorship": {
@@ -45,8 +45,8 @@
 	"label": "Operators"
     },
     "onionservices": {
-	"path": "#onion-services",
-	"control": "onion-services",
+	"path": "#onionservices",
+	"control": "onionservices",
 	"label": "Onion Services"
     },
     "misc": {
diff --git a/uk.json b/uk.json
index a9c67d96b..2179f8d78 100644
--- a/uk.json
+++ b/uk.json
@@ -5,18 +5,18 @@
 	"label": "Ð?айбÑ?лÑ?Ñ? ЧÐ?Ñ?Ñ?Ñ? Ð?иÑ?аннÑ?"
     },
     "tbb": {
-	"path": "#tor-бÑ?аÑ?зеÑ?",
-	"control": "tor-бÑ?аÑ?зеÑ?",
+	"path": "#tbb",
+	"control": "tbb",
 	"label": "Tor бÑ?аÑ?зеÑ?"
     },
     "tormessenger": {
-	"path": "#tor-messenger",
-	"control": "tor-messenger",
+	"path": "#tormessenger",
+	"control": "tormessenger",
 	"label": "Tor Messenger"
     },
     "tormobile": {
-	"path": "#мобÑ?лÑ?ний-tor",
-	"control": "мобÑ?лÑ?ний-tor",
+	"path": "#tormobile",
+	"control": "tormobile",
 	"label": "Ð?обÑ?лÑ?ний Tor"
     },
     "gettor": {
@@ -25,8 +25,8 @@
 	"label": "GetTor"
     },
     "connecting": {
-	"path": "#пÑ?д'Ñ?днаннÑ?-до-tor",
-	"control": "пÑ?д'Ñ?днаннÑ?-до-tor",
+	"path": "#connectingtotor",
+	"control": "connectingtotor",
 	"label": "Ð?Ñ?д'Ñ?днаннÑ? до Tor"
     },
     "censorship": {
@@ -45,8 +45,8 @@
 	"label": "Ð?пеÑ?аÑ?оÑ?и"
     },
     "onionservices": {
-	"path": "#Ñ?лÑ?жби-onion",
-	"control": "Ñ?лÑ?жби-onion",
+	"path": "#onionservices",
+	"control": "onionservices",
 	"label": "СлÑ?жби Onion"
     },
     "misc": {
diff --git a/ur.json b/ur.json
index 7b9006505..63a46e0ca 100644
--- a/ur.json
+++ b/ur.json
@@ -5,18 +5,18 @@
 	"label": "Most Frequently Asked Questions"
     },
     "tbb": {
-	"path": "#tor-browser",
-	"control": "tor-browser",
+	"path": "#tbb",
+	"control": "tbb",
 	"label": "Tor Browser"
     },
     "tormessenger": {
-	"path": "#tor-messenger",
-	"control": "tor-messenger",
+	"path": "#tormessenger",
+	"control": "tormessenger",
 	"label": "Tor Messenger"
     },
     "tormobile": {
-	"path": "#tor-mobile",
-	"control": "tor-mobile",
+	"path": "#tormobile",
+	"control": "tormobile",
 	"label": "Tor Mobile"
     },
     "gettor": {
@@ -25,8 +25,8 @@
 	"label": "GetTor"
     },
     "connecting": {
-	"path": "#connecting-to-tor",
-	"control": "connecting-to-tor",
+	"path": "#connectingtotor",
+	"control": "connectingtotor",
 	"label": "Connecting To Tor"
     },
     "censorship": {
@@ -45,8 +45,8 @@
 	"label": "Operators"
     },
     "onionservices": {
-	"path": "#onion-services",
-	"control": "onion-services",
+	"path": "#onionservices",
+	"control": "onionservices",
 	"label": "Onion Services"
     },
     "misc": {
diff --git a/ur_PK.json b/ur_PK.json
index 0592eb559..a9a65296e 100644
--- a/ur_PK.json
+++ b/ur_PK.json
@@ -5,18 +5,18 @@
 	"label": "Most Frequently Asked Questions"
     },
     "tbb": {
-	"path": "#tor-browser",
-	"control": "tor-browser",
+	"path": "#tbb",
+	"control": "tbb",
 	"label": "ٹار براؤزر"
     },
     "tormessenger": {
-	"path": "#tor-messenger",
-	"control": "tor-messenger",
+	"path": "#tormessenger",
+	"control": "tormessenger",
 	"label": "Tor Messenger"
     },
     "tormobile": {
-	"path": "#tor-mobile",
-	"control": "tor-mobile",
+	"path": "#tormobile",
+	"control": "tormobile",
 	"label": "Tor Mobile"
     },
     "gettor": {
@@ -25,8 +25,8 @@
 	"label": "GetTor"
     },
     "connecting": {
-	"path": "#connecting-to-tor",
-	"control": "connecting-to-tor",
+	"path": "#connectingtotor",
+	"control": "connectingtotor",
 	"label": "Connecting To Tor"
     },
     "censorship": {
@@ -45,8 +45,8 @@
 	"label": "Operators"
     },
     "onionservices": {
-	"path": "#onion-services",
-	"control": "onion-services",
+	"path": "#onionservices",
+	"control": "onionservices",
 	"label": "Onion Services"
     },
     "misc": {
diff --git a/uz.json b/uz.json
index b9b62171f..e954a7cd8 100644
--- a/uz.json
+++ b/uz.json
@@ -5,18 +5,18 @@
 	"label": "Most Frequently Asked Questions"
     },
     "tbb": {
-	"path": "#tor-browser",
-	"control": "tor-browser",
+	"path": "#tbb",
+	"control": "tbb",
 	"label": "Tor Browser"
     },
     "tormessenger": {
-	"path": "#tor-messenger",
-	"control": "tor-messenger",
+	"path": "#tormessenger",
+	"control": "tormessenger",
 	"label": "Tor Messenger"
     },
     "tormobile": {
-	"path": "#tor-mobile",
-	"control": "tor-mobile",
+	"path": "#tormobile",
+	"control": "tormobile",
 	"label": "Tor Mobile"
     },
     "gettor": {
@@ -25,8 +25,8 @@
 	"label": "GetTor"
     },
     "connecting": {
-	"path": "#connecting-to-tor",
-	"control": "connecting-to-tor",
+	"path": "#connectingtotor",
+	"control": "connectingtotor",
 	"label": "Connecting To Tor"
     },
     "censorship": {
@@ -45,8 +45,8 @@
 	"label": "Operators"
     },
     "onionservices": {
-	"path": "#onion-services",
-	"control": "onion-services",
+	"path": "#onionservices",
+	"control": "onionservices",
 	"label": "Onion Services"
     },
     "misc": {
diff --git a/ve.json b/ve.json
index 7b9006505..63a46e0ca 100644
--- a/ve.json
+++ b/ve.json
@@ -5,18 +5,18 @@
 	"label": "Most Frequently Asked Questions"
     },
     "tbb": {
-	"path": "#tor-browser",
-	"control": "tor-browser",
+	"path": "#tbb",
+	"control": "tbb",
 	"label": "Tor Browser"
     },
     "tormessenger": {
-	"path": "#tor-messenger",
-	"control": "tor-messenger",
+	"path": "#tormessenger",
+	"control": "tormessenger",
 	"label": "Tor Messenger"
     },
     "tormobile": {
-	"path": "#tor-mobile",
-	"control": "tor-mobile",
+	"path": "#tormobile",
+	"control": "tormobile",
 	"label": "Tor Mobile"
     },
     "gettor": {
@@ -25,8 +25,8 @@
 	"label": "GetTor"
     },
     "connecting": {
-	"path": "#connecting-to-tor",
-	"control": "connecting-to-tor",
+	"path": "#connectingtotor",
+	"control": "connectingtotor",
 	"label": "Connecting To Tor"
     },
     "censorship": {
@@ -45,8 +45,8 @@
 	"label": "Operators"
     },
     "onionservices": {
-	"path": "#onion-services",
-	"control": "onion-services",
+	"path": "#onionservices",
+	"control": "onionservices",
 	"label": "Onion Services"
     },
     "misc": {
diff --git a/vi.json b/vi.json
index 2cf484948..728a55c4e 100644
--- a/vi.json
+++ b/vi.json
@@ -5,18 +5,18 @@
 	"label": "Most Frequently Asked Questions"
     },
     "tbb": {
-	"path": "#tor-browser",
-	"control": "tor-browser",
+	"path": "#tbb",
+	"control": "tbb",
 	"label": "Trình duy�t Tor"
     },
     "tormessenger": {
-	"path": "#tor-messenger",
-	"control": "tor-messenger",
+	"path": "#tormessenger",
+	"control": "tormessenger",
 	"label": "Tor Messenger"
     },
     "tormobile": {
-	"path": "#tor-mobile",
-	"control": "tor-mobile",
+	"path": "#tormobile",
+	"control": "tormobile",
 	"label": "Tor Mobile"
     },
     "gettor": {
@@ -25,8 +25,8 @@
 	"label": "GetTor"
     },
     "connecting": {
-	"path": "#connecting-to-tor",
-	"control": "connecting-to-tor",
+	"path": "#connectingtotor",
+	"control": "connectingtotor",
 	"label": "Connecting To Tor"
     },
     "censorship": {
@@ -45,8 +45,8 @@
 	"label": "Operators"
     },
     "onionservices": {
-	"path": "#onion-services",
-	"control": "onion-services",
+	"path": "#onionservices",
+	"control": "onionservices",
 	"label": "Các D�ch vụ Onion"
     },
     "misc": {
diff --git a/wa.json b/wa.json
index 7b9006505..63a46e0ca 100644
--- a/wa.json
+++ b/wa.json
@@ -5,18 +5,18 @@
 	"label": "Most Frequently Asked Questions"
     },
     "tbb": {
-	"path": "#tor-browser",
-	"control": "tor-browser",
+	"path": "#tbb",
+	"control": "tbb",
 	"label": "Tor Browser"
     },
     "tormessenger": {
-	"path": "#tor-messenger",
-	"control": "tor-messenger",
+	"path": "#tormessenger",
+	"control": "tormessenger",
 	"label": "Tor Messenger"
     },
     "tormobile": {
-	"path": "#tor-mobile",
-	"control": "tor-mobile",
+	"path": "#tormobile",
+	"control": "tormobile",
 	"label": "Tor Mobile"
     },
     "gettor": {
@@ -25,8 +25,8 @@
 	"label": "GetTor"
     },
     "connecting": {
-	"path": "#connecting-to-tor",
-	"control": "connecting-to-tor",
+	"path": "#connectingtotor",
+	"control": "connectingtotor",
 	"label": "Connecting To Tor"
     },
     "censorship": {
@@ -45,8 +45,8 @@
 	"label": "Operators"
     },
     "onionservices": {
-	"path": "#onion-services",
-	"control": "onion-services",
+	"path": "#onionservices",
+	"control": "onionservices",
 	"label": "Onion Services"
     },
     "misc": {
diff --git a/wo.json b/wo.json
index 7b9006505..63a46e0ca 100644
--- a/wo.json
+++ b/wo.json
@@ -5,18 +5,18 @@
 	"label": "Most Frequently Asked Questions"
     },
     "tbb": {
-	"path": "#tor-browser",
-	"control": "tor-browser",
+	"path": "#tbb",
+	"control": "tbb",
 	"label": "Tor Browser"
     },
     "tormessenger": {
-	"path": "#tor-messenger",
-	"control": "tor-messenger",
+	"path": "#tormessenger",
+	"control": "tormessenger",
 	"label": "Tor Messenger"
     },
     "tormobile": {
-	"path": "#tor-mobile",
-	"control": "tor-mobile",
+	"path": "#tormobile",
+	"control": "tormobile",
 	"label": "Tor Mobile"
     },
     "gettor": {
@@ -25,8 +25,8 @@
 	"label": "GetTor"
     },
     "connecting": {
-	"path": "#connecting-to-tor",
-	"control": "connecting-to-tor",
+	"path": "#connectingtotor",
+	"control": "connectingtotor",
 	"label": "Connecting To Tor"
     },
     "censorship": {
@@ -45,8 +45,8 @@
 	"label": "Operators"
     },
     "onionservices": {
-	"path": "#onion-services",
-	"control": "onion-services",
+	"path": "#onionservices",
+	"control": "onionservices",
 	"label": "Onion Services"
     },
     "misc": {
diff --git a/zh_CN.json b/zh_CN.json
index f9afa7cf2..4043509d8 100644
--- a/zh_CN.json
+++ b/zh_CN.json
@@ -5,18 +5,18 @@
 	"label": "常���"
     },
     "tbb": {
-	"path": "#tor���",
-	"control": "tor���",
+	"path": "#tbb",
+	"control": "tbb",
 	"label": "tor���"
     },
     "tormessenger": {
-	"path": "#tor-messenger",
-	"control": "tor-messenger",
+	"path": "#tormessenger",
+	"control": "tormessenger",
 	"label": "Tor Messenger"
     },
     "tormobile": {
-	"path": "#tor-mobile",
-	"control": "tor-mobile",
+	"path": "#tormobile",
+	"control": "tormobile",
 	"label": "Tor Mobile"
     },
     "gettor": {
@@ -25,8 +25,8 @@
 	"label": "GetTor"
     },
     "connecting": {
-	"path": "#è¿?æ?¥tor",
-	"control": "è¿?æ?¥tor",
+	"path": "#connectingtotor",
+	"control": "connectingtotor",
 	"label": "è¿?æ?¥Tor"
     },
     "censorship": {
@@ -45,8 +45,8 @@
 	"label": "é??项"
     },
     "onionservices": {
-	"path": "#æ´?è?±æ??å?¡",
-	"control": "æ´?è?±æ??å?¡",
+	"path": "#onionservices",
+	"control": "onionservices",
 	"label": "æ´?è?±æ??å?¡"
     },
     "misc": {
diff --git a/zh_HK.json b/zh_HK.json
index d3a738cb5..3ab7dcb8f 100644
--- a/zh_HK.json
+++ b/zh_HK.json
@@ -5,18 +5,18 @@
 	"label": "Most Frequently Asked Questions"
     },
     "tbb": {
-	"path": "#tor-browser",
-	"control": "tor-browser",
+	"path": "#tbb",
+	"control": "tbb",
 	"label": "Toræ´?è?¥è·¯ç?±ç??覽å?¨"
     },
     "tormessenger": {
-	"path": "#tor-messenger",
-	"control": "tor-messenger",
+	"path": "#tormessenger",
+	"control": "tormessenger",
 	"label": "Tor Messenger"
     },
     "tormobile": {
-	"path": "#tor-mobile",
-	"control": "tor-mobile",
+	"path": "#tormobile",
+	"control": "tormobile",
 	"label": "Tor Mobile"
     },
     "gettor": {
@@ -25,8 +25,8 @@
 	"label": "GetTor"
     },
     "connecting": {
-	"path": "#connecting-to-tor",
-	"control": "connecting-to-tor",
+	"path": "#connectingtotor",
+	"control": "connectingtotor",
 	"label": "Connecting To Tor"
     },
     "censorship": {
@@ -45,8 +45,8 @@
 	"label": "Operators"
     },
     "onionservices": {
-	"path": "#onion-services",
-	"control": "onion-services",
+	"path": "#onionservices",
+	"control": "onionservices",
 	"label": "Onion Services"
     },
     "misc": {
diff --git a/zh_TW.json b/zh_TW.json
index 75d08a169..a1af27b2a 100644
--- a/zh_TW.json
+++ b/zh_TW.json
@@ -5,18 +5,18 @@
 	"label": "Most Frequently Asked Questions"
     },
     "tbb": {
-	"path": "#tor-browser",
-	"control": "tor-browser",
+	"path": "#tbb",
+	"control": "tbb",
 	"label": "æ´?è?¥è·¯ç?±ç??覽å?¨"
     },
     "tormessenger": {
-	"path": "#tor-messenger",
-	"control": "tor-messenger",
+	"path": "#tormessenger",
+	"control": "tormessenger",
 	"label": "Tor Messenger"
     },
     "tormobile": {
-	"path": "#tor-mobile",
-	"control": "tor-mobile",
+	"path": "#tormobile",
+	"control": "tormobile",
 	"label": "Tor Mobile"
     },
     "gettor": {
@@ -25,8 +25,8 @@
 	"label": "GetTor"
     },
     "connecting": {
-	"path": "#connecting-to-tor",
-	"control": "connecting-to-tor",
+	"path": "#connectingtotor",
+	"control": "connectingtotor",
 	"label": "Connecting To Tor"
     },
     "censorship": {
@@ -45,8 +45,8 @@
 	"label": "Operators"
     },
     "onionservices": {
-	"path": "#onion-services",
-	"control": "onion-services",
+	"path": "#onionservices",
+	"control": "onionservices",
 	"label": "æ´?è?¥æ??å??"
     },
     "misc": {
diff --git a/zu.json b/zu.json
index 7b9006505..63a46e0ca 100644
--- a/zu.json
+++ b/zu.json
@@ -5,18 +5,18 @@
 	"label": "Most Frequently Asked Questions"
     },
     "tbb": {
-	"path": "#tor-browser",
-	"control": "tor-browser",
+	"path": "#tbb",
+	"control": "tbb",
 	"label": "Tor Browser"
     },
     "tormessenger": {
-	"path": "#tor-messenger",
-	"control": "tor-messenger",
+	"path": "#tormessenger",
+	"control": "tormessenger",
 	"label": "Tor Messenger"
     },
     "tormobile": {
-	"path": "#tor-mobile",
-	"control": "tor-mobile",
+	"path": "#tormobile",
+	"control": "tormobile",
 	"label": "Tor Mobile"
     },
     "gettor": {
@@ -25,8 +25,8 @@
 	"label": "GetTor"
     },
     "connecting": {
-	"path": "#connecting-to-tor",
-	"control": "connecting-to-tor",
+	"path": "#connectingtotor",
+	"control": "connectingtotor",
 	"label": "Connecting To Tor"
     },
     "censorship": {
@@ -45,8 +45,8 @@
 	"label": "Operators"
     },
     "onionservices": {
-	"path": "#onion-services",
-	"control": "onion-services",
+	"path": "#onionservices",
+	"control": "onionservices",
 	"label": "Onion Services"
     },
     "misc": {

_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits