Merge branch 'master' into dev

templates/upload.html

@@ -21,7 +21,8 @@
       </div>
       <div class="form-group">
           <label for="c">{{T "category"}}</label>
-          <select name="c" class="form-control input-sm">
+          <select name="c" class="form-control input-sm" required>
+              <option value="">{{T "select_a_torrent_category"}}</option>
               <option value="3_12" {{if eq .Category "3_12"}}selected{{end}}>{{T "anime_amv"}}</option>
               <option value="3_5" {{if eq .Category "3_5"}}selected{{end}}>{{T "anime_english_translated"}}</option>
               <option value="3_13" {{if eq .Category "3_13"}}selected{{end}}>{{T "anime_non_english_translated"}}</option>

translations/en-us.all.json

@@ -351,6 +351,10 @@
     "id": "all_categories",
     "translation": "All categories"
   },
+  {
+    "id:": "select_a_torrent_category",
+    "translation": "Select a Torrent Category"
+  },
   {
     "id": "anime",
     "translation": "Anime"

translations/fr-fr.all.json

@@ -341,7 +341,7 @@
   },
   {
     "id": "uploading_file_prefills_fields",
-    "translation": "Il est recommandé d'uploader un fichier torrent afin de pré-remplir certains champs."
+    "translation": "Il est recommandé d'uploader un fichier torrent afin de préremplir certains champs."
   },
   {
     "id": "magnet_link",