Merge branch 'master' into v3

4chan_x.user.js

@@ -173,7 +173,7 @@
       'submit QR': ['alt+s', 'Submit post.'],
       'watch': ['w', 'Watch thread.'],
       'update': ['u', 'Update the thread now.'],
-      'reset unread count': ['r', 'Reset unread status.'],
+      'read thread': ['r', 'Mark thread as read.'],
       'expand image': ['E', 'Expand selected image.'],
       'expand images': ['e', 'Expand all images.'],
       'front page': ['0', 'Jump to page 0.'],

changelog

@@ -2,6 +2,12 @@ alpha
 - Mayhem
   Fix Chrome's install warning that 4chan X would execute on all domains.
 
+2.34.9
+- Mayhem
+  Add /g/, /k/, /w/, /an/, /cgl/, /ck/, /lit/, /toy/ and /x/ archived image redirection.
+  One-word-captcha now works in the report window.
+  Fix duplicate file upload error link.
+
 2.34.8
 - Mayhem
   One-word-captcha: you don't need to input an extra space anymore, the true word will be duplicated.

latest.js

@@ -1 +1 @@
-postMessage({version:'2.34.8'},'*')
+postMessage({version:'2.34.9'},'*')

script.coffee

@@ -135,7 +135,7 @@ Config =
     # Thread related
     'watch':              ['w',      'Watch thread.']
     'update':             ['u',      'Update the thread now.']
-    'reset unread count': ['r',      'Reset unread status.']
+    'read thread':        ['r',      'Mark thread as read.']
     # Images
     'expand image':       ['E',      'Expand selected image.']
     'expand images':      ['e',      'Expand all images.']