Merge pull request #508 from yiiTT/master

FAQ Tracker recomendation

templates/FAQ.html

@@ -42,15 +42,14 @@
 
         <h2 id="trackers">{{T "which_trackers_do_you_recommend"}}</h2>
         <p>{{T "answer_which_trackers_do_you_recommend"}}</p>
-	<pre>udp://tracker.doko.moe:6969</pre>
-        <p>{{T "other_trackers"}}</p>
-	<pre>udp://zer0day.to:1337/announce
-             udp://tracker.leechers-paradise.org:6969
-             udp://explodie.org:6969
-             udp://tracker.opentrackr.org:1337
-             udp://tracker.internetwarriors.net:1337/announce
-            http://mgtracker.org:6969/announce
-            http://tracker.baka-sub.cf/announce</pre>
+        <pre>udp://tracker.doko.moe:6969
+udp://zer0day.to:1337/announce
+udp://tracker.leechers-paradise.org:6969
+udp://explodie.org:6969
+udp://tracker.opentrackr.org:1337
+udp://tracker.internetwarriors.net:1337/announce
+http://mgtracker.org:6969/announce
+http://tracker.baka-sub.cf/announce</pre>
 
         <h2>{{T "how_can_i_help"}}</h2>
         <p>{{T "answer_how_can_i_help"}}</p>

translations/en-us.all.json

@@ -317,11 +317,7 @@
   },
   {
     "id": "answer_which_trackers_do_you_recommend",
-    "translation": "We now have our own Tracker!, add it to the top of the list before uploading:"
-  },
-  {
-    "id": "other_trackers",
-    "translation": "But you should also add these, just in case something goes wrong"
+    "translation": "We now have our own Tracker called doko.moe, add it to the top of the list before uploading. You should add all of these trackers to keep the torrent resilient."
   },
   {
     "id": "how_can_i_help",