Merge pull request #452 from S0X-LT/dev

Adding our tracker to FAQ

templates/FAQ.html

@@ -39,14 +39,15 @@
 
         <h2 id="trackers">{{T "which_trackers_do_you_recommend"}}</h2>
         <p>{{T "answer_which_trackers_do_you_recommend"}}</p>
-        <pre>udp://tracker.coppersurfer.tk: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>
+	<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>
 
         <h2>{{T "how_can_i_help"}}</h2>
         <p>{{T "answer_how_can_i_help"}}</p>

translations/en-us.all.json

@@ -249,7 +249,7 @@
   },
   {
     "id": "future_not_looking_good",
-    "translation": "Future prospects for nyaa are not looking good. (It's dead)"
+    "translation": "Future prospects for nyaa are not looking good. (It's dead, Jim)"
   },
   {
     "id": "recovery_effort",
@@ -309,7 +309,11 @@
   },
   {
     "id": "answer_which_trackers_do_you_recommend",
-    "translation": "If your torrent upload is denied because of trackers you'll need to add some of these:"
+    "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"
   },
   {
     "id": "how_can_i_help",