4.1.2

Close #133

TODO.md

@@ -8,12 +8,8 @@ P2
 
 Planned for later.
 
-* Soft errors and retry logic
-  * Big caveat: When the server still responds, like 50x errors which would be recoverable, we actually have no way of knowing it did in respond in such a way. See P4 - Handle Errors remarks.
-* Delete files (well, as far as the browser allows)
 * Inter-addon API (basic)
   * Add downloads
-* Chrome support
 * vtable perf: cache column widths
 * Download options
   * This is a bit more limited, as we cannot modify options of downloads that have been started (and paused) or that are done.
@@ -46,8 +42,6 @@ Stuff that probably cannot be implemented due to WeberEension limitations.
   * Firefox helpfully keeps different lists of downloads. One for newly added downloads, and other ones for "previous" downloads. Turns out the WebExtension API only ever queries the "new" list.
 * Segmented downloads
   * Cannot be done with WebExtensions - downloads API has no support and manually downloading, storing in temporary add-on storage and reassmbling the downloaded parts later is not only efficient but does not reliabliy work due to storage limitations.
-* Handle errors, 404 and such
-  * The Firefox download manager is too stupid and webRequest does not see Downloads, so cannot be done right now.
 * Conflicts: ask when a file exists
   * Not supported by Firefox
 * Speed limiter

_locales/all.json

@@ -1,19 +1,24 @@
 {
+  "ar": "العربية [ar]",
+  "bg": "Български [bg]",
   "cs": "Čeština (CZ) [cs]",
+  "da": "Dansk [da]",
   "de": "Deutsch [de]",
   "el": "Ελληνικά [el]",
   "en": "English (US) [en]",
   "es": "Español (España) [es]",
-  "et": "Eesti Keel [et]",
-  "fr": "Français (FR) [fr]",
+  "et": "Eesti keel [et]",
+  "fr": "Français [fr]",
   "hu": "Magyar (HU) [hu]",
   "id": "Bahasa Indonesia [id]",
+  "it": "Italiano [it]",
+  "ja": "日本語 (JP) [ja]",
   "ko": "한국어 [ko]",
   "lt": "Lietuvių [lt]",
   "nl": "Nederlands [nl]",
-  "pl": "Polski (PL) [pl]",
+  "pl": "Polski [pl]",
   "pt": "Português (Brasil) [pt]",
   "ru": "Русский [ru]",
   "zh_CN": "简体中文 [zh_CN]",
   "zh_TW": "正體中文 [zh_TW]"
-}
+}

_locales/el/messages.json

@@ -191,6 +191,22 @@
     "message": "Διαγραφή",
     "description": "button text"
   },
+  "deletefiles": {
+    "message": "Διαγραφή Αρχείων",
+    "description": "menu action"
+  },
+  "deletefiles_button": {
+    "message": "Διαγραφή",
+    "description": "button text"
+  },
+  "deletefiles_text": {
+    "message": "Θέλετε σίγουρα να διαγράψετε τα ακόλουθα αρχεία;",
+    "description": "messagebox text"
+  },
+  "deletefiles_title": {
+    "message": "Διαγραφή Αρχείων",
+    "description": "messagebox title"
+  },
   "description": {
     "message": "Περιγραφή",
     "description": "Description (keep it short); e.g. the description column in select"
@@ -275,6 +291,14 @@
     "message": "Μη έγκυρο URL",
     "description": "Error message; single window"
   },
+  "error_noabsolutepath": {
+    "message": "Οι πλήρεις διαδρομές υποφακέλων δεν υποστηρίζονται από τους φυλλομετρητές",
+    "description": "Error Message; select/single window"
+  },
+  "error_nodotsinpath": {
+    "message": "Οι τελείες (.) στους υποφακέλους δεν υποστηρίζονται από τους φυλλομετρητές",
+    "description": "Error Message; select/single window"
+  },
   "error_noItemsSelected": {
     "message": "Δεν επιλέχθηκαν αντικείμενα",
     "description": "Error Message; select window"
@@ -529,6 +553,26 @@
     "message": "Προσθήκη νέων λήψεων σε παύση, αντί για άμεση εκκίνησή τους",
     "description": "Preferences/General"
   },
+  "pref_button_type": {
+    "message": "Κουμπί Λήψης Όλων",
+    "description": "label"
+  },
+  "pref_button_type_dta": {
+    "message": "Επιλογή Λήψης Όλων",
+    "description": "label"
+  },
+  "pref_button_type_manager": {
+    "message": "Άνοιγμα Διαχειριστή",
+    "description": "label"
+  },
+  "pref_button_type_popup": {
+    "message": "Αναδυόμενο μενού",
+    "description": "label"
+  },
+  "pref_button_type_turbo": {
+    "message": "ΜονόΚλικ!",
+    "description": "label"
+  },
   "pref_concurrent_downloads": {
     "message": "Ταυτόχρονες λήψεις",
     "description": "Preferences/Network"
@@ -537,10 +581,6 @@
     "message": "Προβολή ειδοποίησης με την ολοκλήρωση της ουράς λήψεων",
     "description": "Preferences/General"
   },
-  "pref_global_turbo": {
-    "message": "Το κουμπί φυλλομετρητή πρέπει να είναι το ΜονόΚλικ!",
-    "description": "Preferences/General"
-  },
   "pref_hide_context": {
     "message": "Απόκρυψη αντικειμένων μενού γενικού περιεχομένου",
     "description": "Preferences/General"
@@ -549,6 +589,10 @@
     "message": "Διαχειριστής",
     "description": "Preferences/General; group text"
   },
+  "pref_manager_in_popup": {
+    "message": "Άνοιγμα διαχειριστή σε νέο αναδυόμενο παράθυρο",
+    "description": "checkbox text"
+  },
   "pref_manager_tooltip": {
     "message": "Προβολή επεξηγήσεων στις καρτέλες Διαχειριστή",
     "description": "Preferences/General"
@@ -573,10 +617,22 @@
     "message": "Απομάκρυνση αγνοημένων λήψεων μετά την επανεκκίνηση",
     "description": "Preferences/General"
   },
+  "pref_retries": {
+    "message": "Αριθμός επαναλήψεων λήψεων με προσωρινά σφάλματα",
+    "description": "pref text"
+  },
+  "pref_retry_time": {
+    "message": "Επανάληψη κάθε (σε λεπτά)",
+    "description": "pref text"
+  },
   "pref_show_urls": {
     "message": "Προβολή URLs αντί για Ονόματα",
     "description": "Preferences/General"
   },
+  "pref_sounds": {
+    "message": "Αναπαραγωγή ήχων",
+    "description": "checkbox text"
+  },
   "pref_text_links": {
     "message": "Δοκιμή εύρεσης συνδέσμων στο κείμενο της ιστοσελίδας (αργό)",
     "description": "Preferences/General"
@@ -895,6 +951,20 @@
     "message": "Συνέχιση",
     "description": "Action for resuming a download"
   },
+  "retrying": {
+    "message": "Επανάληψη",
+    "description": "Status text"
+  },
+  "retrying_error": {
+    "message": "Επανάληψη - $ERROR$",
+    "description": "status text",
+    "placeholders": {
+      "error": {
+        "content": "$1",
+        "example": "Server Error"
+      }
+    }
+  },
   "running": {
     "message": "Σε λειτουργία",
     "description": "Status text"
@@ -943,6 +1013,18 @@
     "message": "Ορισμός Μάσκας Μετονομασίας",
     "description": "Menu text; select window"
   },
+  "set_mask_text": {
+    "message": "Ορισμός μιας νέας μάσκας μετονομασίας",
+    "description": "dialog text"
+  },
+  "set_referrer": {
+    "message": "Ορισμός Αναφορέα",
+    "description": "menu text"
+  },
+  "set_referrer_text": {
+    "message": "Ορισμός νέου αναφορέα",
+    "description": "dialog text"
+  },
   "single_batchexamples": {
     "message": "Οι δέσμες υποστηρίζονται, π.χ.:",
     "description": "Header text; single window"
@@ -1123,6 +1205,14 @@
     "message": "Καμία νέα Λήψη δεν θα εκκινηθεί",
     "description": "Status bar tooltip; manager network icon"
   },
+  "subfolder": {
+    "message": "Υποφάκελος:",
+    "description": "label text"
+  },
+  "subfolder_placeholder": {
+    "message": "Τοποθέτηση αρχείων σε αυτό τον υποφάκελο μέσα στον φάκελο λήψεών σας",
+    "description": "placeholder text within an input box"
+  },
   "title": {
     "message": "Τίτλος",
     "description": "Column text; Title label (short)"
@@ -1166,5 +1256,9 @@
   "useonlyonce": {
     "message": "Χρήση μόνο μια φορά",
     "description": "Label for Use-Once checkboxes"
+  },
+  "USER_CANCELED": {
+    "message": "Ακύρωση του χρήστη",
+    "description": "Error message"
   }
 }

_locales/en/messages.json

@@ -27,18 +27,90 @@
     "description": "Error message",
     "message": "Unauthorized"
   },
+  "USER_CANCELED": {
+    "description": "Error message",
+    "message": "User Canceled"
+  },
+  "add_download": {
+    "description": "Action for adding a download",
+    "message": "Add Download"
+  },
+  "add_new": {
+    "description": "Button text (adding filters, limits and such)",
+    "message": "Add New"
+  },
+  "add_paused_once": {
+    "description": "Checkbox label",
+    "message": "Only add paused this time"
+  },
+  "add_paused_question": {
+    "description": "Messagebox text",
+    "message": "Do you want to remember this decision and always add new downloads paused from now on?"
+  },
+  "add_paused_title": {
+    "description": "Title for the add-paused dialog",
+    "message": "Always add paused?"
+  },
   "addpaused": {
     "description": "Action: Add paused",
     "message": "Add paused"
   },
+  "ask_again_later": {
+    "description": "Button text",
+    "message": "Ask me again later"
+  },
+  "batch_batch": {
+    "description": "Button text",
+    "message": "Batch Download"
+  },
+  "batch_desc": {
+    "description": "",
+    "message": "The current URL seems to contain instructions for a batch download."
+  },
+  "batch_items": {
+    "description": "Messagebox info text for batch confirmations",
+    "message": "Number of items:"
+  },
+  "batch_preview": {
+    "description": "Messagebox info text for batch confirmations",
+    "message": "Preview:"
+  },
+  "batch_question": {
+    "description": "Messagebox info text for batch confirmations",
+    "message": "Do you want to add this as a batch or as a single download?"
+  },
+  "batch_single": {
+    "description": "Button text for batch confirmation",
+    "message": "Single Download"
+  },
+  "batch_title": {
+    "description": "Messagebox title for batch confirmations",
+    "message": "Batch Download"
+  },
   "cancel": {
     "description": "Button text: Cancel",
     "message": "Cancel"
   },
+  "cancel_download": {
+    "description": "Action to cancel downloads, e.g. from the context menu",
+    "message": "Cancel"
+  },
   "canceled": {
     "description": "Download status text",
     "message": "Canceled"
   },
+  "cannot_be_empty": {
+    "description": "Error message when an input field is empty but has to have a value",
+    "message": "This field cannot be empty"
+  },
+  "change_later_reminder": {
+    "description": "Checkbox label text for decision confirmations",
+    "message": "You can later change this decision in the Preferences"
+  },
+  "check_selected_items": {
+    "description": "Menu text",
+    "message": "Check Selected Items"
+  },
   "colConnections": {
     "description": "Table column in prefs/network",
     "message": "Concurrent Connections"
@@ -75,276 +147,6 @@
     "description": "Table column in manager",
     "message": "Speed"
   },
-  "delete": {
-    "description": "button text",
-    "message": "Delete"
-  },
-  "description": {
-    "description": "Description (keep it short); e.g. the description column in select",
-    "message": "Description"
-  },
-  "donate": {
-    "description": "Donate button",
-    "message": "Donate!"
-  },
-  "done": {
-    "description": "Status text",
-    "message": "Done"
-  },
-  "download": {
-    "description": "Download (noun); e.g. Download column in select",
-    "message": "Download"
-  },
-  "extensionDescription": {
-    "description": "DownThemAll! tagline, displayed in about:addons; Please do NOT refer to a specific browser such as firefox, as we will probably support more than one",
-    "message": "The Mass Downloader for your browser"
-  },
-  "fastfiltering": {
-    "description": "Label for Fast Filtering input",
-    "message": "Fast Filtering"
-  },
-  "finishing": {
-    "description": "Status text",
-    "message": "Finishing"
-  },
-  "language": {
-    "description": "Lanuage Name in your language",
-    "message": "English (US)"
-  },
-  "language_code": {
-    "description": "Language code the locale will use, e.g. de or en-GB or pt-BR",
-    "message": "en"
-  },
-  "links": {
-    "description": "Links tab label (short); select window",
-    "message": "Links"
-  },
-  "mask": {
-    "description": "Renaming mask (short); used in e.g. select",
-    "message": "Mask"
-  },
-  "media": {
-    "description": "Media label (short)",
-    "message": "Media"
-  },
-  "missing": {
-    "description": "Status text in manager",
-    "message": "Missing"
-  },
-  "ok": {
-    "description": "Button text; Used in message boxes",
-    "message": "OK"
-  },
-  "paused": {
-    "description": "Status text; manager",
-    "message": "Paused"
-  },
-  "queued": {
-    "description": "Status text",
-    "message": "Queued"
-  },
-  "referrer": {
-    "description": "Label for \"Referrer\"",
-    "message": "Referrer"
-  },
-  "remember": {
-    "description": "Checkbox text for confirmation, e.g. when removing a download in manager",
-    "message": "Remember this decision"
-  },
-  "rename": {
-    "description": "UI for renaming; currently unused",
-    "message": "Rename"
-  },
-  "renmask": {
-    "description": "Renaming mask (long)",
-    "message": "Renaming mask"
-  },
-  "reset": {
-    "description": "Button text; pref window",
-    "message": "Reset"
-  },
-  "running": {
-    "description": "Status text",
-    "message": "Running"
-  },
-  "save": {
-    "description": "Button text; e.g. prefs/Network",
-    "message": "Save"
-  },
-  "search": {
-    "description": "Placeholder text; manager status search field",
-    "message": "Search…"
-  },
-  "sizeB": {
-    "description": "Size formatting; bytes",
-    "message": "$S$B",
-    "placeholders": {
-      "s": {
-        "content": "$1",
-        "example": "100b"
-      }
-    }
-  },
-  "sizeGB": {
-    "description": "Size formatting; giga bytes",
-    "message": "$S$GB",
-    "placeholders": {
-      "s": {
-        "content": "$1",
-        "example": "100.200GB"
-      }
-    }
-  },
-  "sizeKB": {
-    "description": "Size formatting; kilo bytes",
-    "message": "$S$KB",
-    "placeholders": {
-      "s": {
-        "content": "$1",
-        "example": "100.2KB"
-      }
-    }
-  },
-  "sizeMB": {
-    "description": "Size formatting; mega bytes",
-    "message": "$S$MB",
-    "placeholders": {
-      "s": {
-        "content": "$1",
-        "example": "100.22MB"
-      }
-    }
-  },
-  "sizePB": {
-    "description": "Size formatting; peta bytes (you never know)",
-    "message": "$S$PB",
-    "placeholders": {
-      "s": {
-        "content": "$1",
-        "example": "100.212PB"
-      }
-    }
-  },
-  "sizeTB": {
-    "description": "Size formatting; tera bytes (you never know)",
-    "message": "$S$TB",
-    "placeholders": {
-      "s": {
-        "content": "$1",
-        "example": "100.002TB"
-      }
-    }
-  },
-  "speedB": {
-    "description": "Speed formatting; bytes",
-    "message": "$SPEED$b/s",
-    "placeholders": {
-      "speed": {
-        "content": "$1",
-        "example": "100b/s"
-      }
-    }
-  },
-  "speedKB": {
-    "description": "Speed formatting; kilo bytes",
-    "message": "$SPEED$KB/s",
-    "placeholders": {
-      "speed": {
-        "content": "$1",
-        "example": "100.1KB/s"
-      }
-    }
-  },
-  "speedMB": {
-    "description": "Speed formatting; mega bytes",
-    "message": "$SPEED$MB/s",
-    "placeholders": {
-      "speed": {
-        "content": "$1",
-        "example": "100.20MB/s"
-      }
-    }
-  },
-  "title": {
-    "description": "Column text; Title label (short)",
-    "message": "Title"
-  },
-  "unlimited": {
-    "description": "Option text; Prefs/Network",
-    "message": "Unlimited"
-  },
-  "useonlyonce": {
-    "description": "Label for Use-Once checkboxes",
-    "message": "Use Once"
-  },
-  "add_download": {
-    "description": "Action for adding a download",
-    "message": "Add Download"
-  },
-  "add_new": {
-    "description": "Button text (adding filters, limits and such)",
-    "message": "Add New"
-  },
-  "add_paused_once": {
-    "description": "Checkbox label",
-    "message": "Only add paused this time"
-  },
-  "add_paused_question": {
-    "description": "Messagebox text",
-    "message": "Do you want to remember this decision and always add new downloads paused from now on?"
-  },
-  "add_paused_title": {
-    "description": "Title for the add-paused dialog",
-    "message": "Always add paused?"
-  },
-  "ask_again_later": {
-    "description": "Button text",
-    "message": "Ask me again later"
-  },
-  "batch_batch": {
-    "description": "Button text",
-    "message": "Batch Download"
-  },
-  "batch_desc": {
-    "description": "",
-    "message": "The current URL seems to contain instructions for a batch download."
-  },
-  "batch_items": {
-    "description": "Messagebox info text for batch confirmations",
-    "message": "Number of items:"
-  },
-  "batch_preview": {
-    "description": "Messagebox info text for batch confirmations",
-    "message": "Preview:"
-  },
-  "batch_question": {
-    "description": "Messagebox info text for batch confirmations",
-    "message": "Do you want to add this as a batch or as a single download?"
-  },
-  "batch_single": {
-    "description": "Button text for batch confirmation",
-    "message": "Single Download"
-  },
-  "batch_title": {
-    "description": "Messagebox title for batch confirmations",
-    "message": "Batch Download"
-  },
-  "cancel_download": {
-    "description": "Action to cancel downloads, e.g. from the context menu",
-    "message": "Cancel"
-  },
-  "cannot_be_empty": {
-    "description": "Error message when an input field is empty but has to have a value",
-    "message": "This field cannot be empty"
-  },
-  "change_later_reminder": {
-    "description": "Checkbox label text for decision confirmations",
-    "message": "You can later change this decision in the Preferences"
-  },
-  "check_selected_items": {
-    "description": "Menu text",
-    "message": "Check Selected Items"
-  },
   "conflict_overwrite": {
     "description": "Option text; prefs/general",
     "message": "Overwrite"
@@ -405,26 +207,58 @@
     "description": "Filter label for the Videos filter",
     "message": "Videos (mp4, webm, mkv, …)"
   },
+  "delete": {
+    "description": "button text",
+    "message": "Delete"
+  },
+  "deletefiles": {
+    "description": "menu action",
+    "message": "Delete Files"
+  },
+  "deletefiles_button": {
+    "description": "button text",
+    "message": "Delete"
+  },
+  "deletefiles_text": {
+    "description": "messagebox text",
+    "message": "Are you sure you want to delete the following files?"
+  },
+  "deletefiles_title": {
+    "description": "messagebox title",
+    "message": "Delete Files"
+  },
+  "description": {
+    "description": "Description (keep it short); e.g. the description column in select",
+    "message": "Description"
+  },
   "disable_other_filters": {
     "description": "Checkbox label. Keep it short",
     "message": "Disable others"
   },
+  "donate": {
+    "description": "Donate button",
+    "message": "Donate!"
+  },
+  "done": {
+    "description": "Status text",
+    "message": "Done"
+  },
+  "download": {
+    "description": "Download (noun); e.g. Download column in select",
+    "message": "Download"
+  },
   "download_verb": {
     "description": "Download (verb/action); e.g. in single and select buttons",
     "message": "Download"
   },
-  "dta_regular_all": {
-    "description": "Menu text",
-    "message": "DownThemAll! - All Tabs"
-  },
-  "dta_turbo_all": {
-    "description": "Menu text",
-    "message": "OneClick! - All Tabs"
-  },
   "dta_regular": {
     "description": "Regular dta action; Menu text",
     "message": "DownThemAll!"
   },
+  "dta_regular_all": {
+    "description": "Menu text",
+    "message": "DownThemAll! - All Tabs"
+  },
   "dta_regular_image": {
     "description": "Menu text",
     "message": "Save Image with DownThemAll!"
@@ -445,6 +279,10 @@
     "description": "OneClick! action; Menu text",
     "message": "OneClick!"
   },
+  "dta_turbo_all": {
+    "description": "Menu text",
+    "message": "OneClick! - All Tabs"
+  },
   "dta_turbo_image": {
     "description": "Menu text",
     "message": "Save Image with OneClick!"
@@ -477,10 +315,42 @@
     "description": "Error Message; select window",
     "message": "No items selected"
   },
+  "error_noabsolutepath": {
+    "description": "Error Message; select/single window",
+    "message": "Absolute paths for subfolders are not supported by browsers"
+  },
+  "error_nodotsinpath": {
+    "description": "Error Message; select/single window",
+    "message": "Dots (.) in subfolders are not supported by browsers"
+  },
+  "export": {
+    "description": "menu text",
+    "message": "Export To File"
+  },
+  "export_aria2": {
+    "description": "menu text",
+    "message": "Export As aria2 List"
+  },
+  "export_metalink": {
+    "description": "menu text",
+    "message": "Export As Metalink"
+  },
+  "export_text": {
+    "description": "menu text",
+    "message": "Export As Text"
+  },
+  "extensionDescription": {
+    "description": "DownThemAll! tagline, displayed in about:addons; Please do NOT refer to a specific browser such as firefox, as we will probably support more than one",
+    "message": "The Mass Downloader for your browser"
+  },
   "fastfilter_placeholder": {
     "description": "Placeholder for fastfilter inputs",
     "message": "Wildcard expression or regular expression"
   },
+  "fastfiltering": {
+    "description": "Label for Fast Filtering input",
+    "message": "Fast Filtering"
+  },
   "filter_at_least_one": {
     "description": "Error message when no filter types are selected for a filter in the preferences UI",
     "message": "You must select at least one filter type!"
@@ -509,10 +379,18 @@
     "description": "Message box label",
     "message": "Filter-Types"
   },
+  "finishing": {
+    "description": "Status text",
+    "message": "Finishing"
+  },
   "force_start": {
     "description": "Menu text",
     "message": "Force Start"
   },
+  "import": {
+    "description": "menu text",
+    "message": "Import From File"
+  },
   "information_title": {
     "description": "Used in message boxes",
     "message": "Information"
@@ -553,10 +431,26 @@
     "description": "Short for PageUp-key",
     "message": "PageUp"
   },
+  "language": {
+    "description": "Lanuage Name in your language",
+    "message": "English (US)"
+  },
+  "language_code": {
+    "description": "Language code the locale will use, e.g. de or en-GB or pt-BR",
+    "message": "en"
+  },
   "limited_to": {
     "description": "Label text; used in prefs/network",
     "message": "Limited to"
   },
+  "links": {
+    "description": "Links tab label (short); select window",
+    "message": "Links"
+  },
+  "manager_short": {
+    "description": "Menu text",
+    "message": "Manager"
+  },
   "manager_status_items": {
     "description": "Status bar text; manager",
     "message": "Completed $COMPLETE$ of $TOTAL$ downloads ($SHOWING$ displayed), $RUNNING$ running",
@@ -579,18 +473,26 @@
       }
     }
   },
-  "manager_short": {
-    "description": "Menu text",
-    "message": "Manager"
-  },
   "manager_title": {
     "description": "Window/tab title",
     "message": "DownThemAll! Manager"
   },
+  "mask": {
+    "description": "Renaming mask (short); used in e.g. select",
+    "message": "Mask"
+  },
   "mask_default": {
     "description": "Status text; Used in the mask column, select window",
     "message": "Default Mask"
   },
+  "media": {
+    "description": "Media label (short)",
+    "message": "Media"
+  },
+  "missing": {
+    "description": "Status text in manager",
+    "message": "Missing"
+  },
   "move_bottom": {
     "description": "Action for moving a download to the bottom",
     "message": "Bottom"
@@ -639,6 +541,10 @@
       }
     }
   },
+  "ok": {
+    "description": "Button text; Used in message boxes",
+    "message": "OK"
+  },
   "open_directory": {
     "description": "Menu text; manager context",
     "message": "Open Directory"
@@ -667,10 +573,34 @@
     "description": "Action for pausing a download",
     "message": "Pause"
   },
+  "paused": {
+    "description": "Status text; manager",
+    "message": "Paused"
+  },
   "pref_add_paused": {
     "description": "Preferences/General",
     "message": "Add new downloads paused, instead of starting them immediately"
   },
+  "pref_button_type": {
+    "description": "label",
+    "message": "DownThemAll! button:"
+  },
+  "pref_button_type_dta": {
+    "description": "label",
+    "message": "DownThemAll! selection"
+  },
+  "pref_button_type_manager": {
+    "description": "label",
+    "message": "Open Manager"
+  },
+  "pref_button_type_popup": {
+    "description": "label",
+    "message": "Popup menu"
+  },
+  "pref_button_type_turbo": {
+    "description": "label",
+    "message": "OneClick!"
+  },
   "pref_concurrent_downloads": {
     "description": "Preferences/Network",
     "message": "Concurrent downloads"
@@ -679,18 +609,26 @@
     "description": "Preferences/General",
     "message": "Show a notification when the queue finishes downloading"
   },
-  "pref_global_turbo": {
-    "description": "Preferences/General",
-    "message": "Browser button should be OneClick!"
-  },
   "pref_hide_context": {
     "description": "Preferences/General",
     "message": "Do not show general context menu items"
   },
+  "pref_manager": {
+    "description": "Preferences/General; group text",
+    "message": "Manager"
+  },
+  "pref_manager_in_popup": {
+    "description": "checkbox text",
+    "message": "Open manager in a new popup window"
+  },
   "pref_manager_tooltip": {
     "description": "Preferences/General",
     "message": "Show tooltips in Manager tabs"
   },
+  "pref_netglobal": {
+    "description": "Preferences/General; group text",
+    "message": "Global Network Limits"
+  },
   "pref_open_manager_on_queue": {
     "description": "Preferences/General",
     "message": "Open the Manager tab after queuing some downloads"
@@ -699,30 +637,34 @@
     "description": "Preferences/General",
     "message": "Show a notification when queuing new downloads"
   },
+  "pref_queueing": {
+    "description": "Preferences/General; group text",
+    "message": "Queuing Downloads"
+  },
   "pref_remove_missing_on_init": {
     "description": "Preferences/General",
     "message": "Remove missing downloads after a restart"
   },
+  "pref_retries": {
+    "description": "pref text",
+    "message": "Number of retries of downloads on temporary errors"
+  },
+  "pref_retry_time": {
+    "description": "pref text",
+    "message": "Retry every (in minutes)"
+  },
   "pref_show_urls": {
     "description": "Preferences/General",
     "message": "Show URLs instead of Names"
   },
+  "pref_sounds": {
+    "description": "checkbox text",
+    "message": "Play sounds"
+  },
   "pref_text_links": {
     "description": "Preferences/General",
     "message": "Try to find links in the website text (slower)"
   },
-  "pref_manager": {
-    "description": "Preferences/General; group text",
-    "message": "Manager"
-  },
-  "pref_netglobal": {
-    "description": "Preferences/General; group text",
-    "message": "Global Network Limits"
-  },
-  "pref_queueing": {
-    "description": "Preferences/General; group text",
-    "message": "Queuing Downloads"
-  },
   "pref_ui": {
     "description": "Preferences/General; group text",
     "message": "User Interface"
@@ -743,6 +685,10 @@
     "description": "Notification text",
     "message": "The download queue has finished"
   },
+  "queued": {
+    "description": "Status text",
+    "message": "Queued"
+  },
   "queued_download": {
     "description": "Notification text; single download",
     "message": "Queued 1 download!"
@@ -757,6 +703,14 @@
       }
     }
   },
+  "referrer": {
+    "description": "Label for \"Referrer\"",
+    "message": "Referrer"
+  },
+  "remember": {
+    "description": "Checkbox text for confirmation, e.g. when removing a download in manager",
+    "message": "Remember this decision"
+  },
   "remove_all_complete_downloads": {
     "description": "Menu text",
     "message": "Remove All Complete"
@@ -889,6 +843,10 @@
     "description": "Menu text",
     "message": "Remove Selected"
   },
+  "rename": {
+    "description": "UI for renaming; currently unused",
+    "message": "Rename"
+  },
   "renamer_batch": {
     "description": "Mask text; see mask button",
     "message": "Batch Number"
@@ -1005,6 +963,14 @@
     "description": "Mask text; see mask button",
     "message": "Date Added - Year"
   },
+  "renmask": {
+    "description": "Renaming mask (long)",
+    "message": "Renaming mask"
+  },
+  "reset": {
+    "description": "Button text; pref window",
+    "message": "Reset"
+  },
   "reset_confirmations": {
     "description": "Button text; pref/General",
     "message": "Reset remembered confirmations"
@@ -1025,6 +991,32 @@
     "description": "Action for resuming a download",
     "message": "Resume"
   },
+  "retrying": {
+    "description": "Status text",
+    "message": "Retrying"
+  },
+  "retrying_error": {
+    "description": "status text",
+    "message": "Retrying - $ERROR$",
+    "placeholders": {
+      "error": {
+        "content": "$1",
+        "example": "Server Error"
+      }
+    }
+  },
+  "running": {
+    "description": "Status text",
+    "message": "Running"
+  },
+  "save": {
+    "description": "Button text; e.g. prefs/Network",
+    "message": "Save"
+  },
+  "search": {
+    "description": "Placeholder text; manager status search field",
+    "message": "Search…"
+  },
   "select_all": {
     "description": "Menu text; e.g. select context",
     "message": "Select All"
@@ -1045,6 +1037,18 @@
     "description": "Menu text; select window",
     "message": "Set Renaming Mask"
   },
+  "set_mask_text": {
+    "description": "dialog text",
+    "message": "Set a new renaming mask"
+  },
+  "set_referrer": {
+    "description": "menu text",
+    "message": "Set Referrer"
+  },
+  "set_referrer_text": {
+    "description": "dialog text",
+    "message": "Set a new referrer"
+  },
   "single_batchexamples": {
     "description": "Header text; single window",
     "message": "Batches are supported, e.g.:"
@@ -1057,6 +1061,66 @@
     "description": "Title of single window",
     "message": "DownThemAll! - Add a link"
   },
+  "sizeB": {
+    "description": "Size formatting; bytes",
+    "message": "$S$B",
+    "placeholders": {
+      "s": {
+        "content": "$1",
+        "example": "100b"
+      }
+    }
+  },
+  "sizeGB": {
+    "description": "Size formatting; giga bytes",
+    "message": "$S$GB",
+    "placeholders": {
+      "s": {
+        "content": "$1",
+        "example": "100.200GB"
+      }
+    }
+  },
+  "sizeKB": {
+    "description": "Size formatting; kilo bytes",
+    "message": "$S$KB",
+    "placeholders": {
+      "s": {
+        "content": "$1",
+        "example": "100.2KB"
+      }
+    }
+  },
+  "sizeMB": {
+    "description": "Size formatting; mega bytes",
+    "message": "$S$MB",
+    "placeholders": {
+      "s": {
+        "content": "$1",
+        "example": "100.22MB"
+      }
+    }
+  },
+  "sizePB": {
+    "description": "Size formatting; peta bytes (you never know)",
+    "message": "$S$PB",
+    "placeholders": {
+      "s": {
+        "content": "$1",
+        "example": "100.212PB"
+      }
+    }
+  },
+  "sizeTB": {
+    "description": "Size formatting; tera bytes (you never know)",
+    "message": "$S$TB",
+    "placeholders": {
+      "s": {
+        "content": "$1",
+        "example": "100.002TB"
+      }
+    }
+  },
   "size_progress": {
     "description": "Status text; manager size column",
     "message": "$WRITTEN$ of $TOTAL$",
@@ -1127,6 +1191,36 @@
       }
     }
   },
+  "speedB": {
+    "description": "Speed formatting; bytes",
+    "message": "$SPEED$b/s",
+    "placeholders": {
+      "speed": {
+        "content": "$1",
+        "example": "100b/s"
+      }
+    }
+  },
+  "speedKB": {
+    "description": "Speed formatting; kilo bytes",
+    "message": "$SPEED$KB/s",
+    "placeholders": {
+      "speed": {
+        "content": "$1",
+        "example": "100.1KB/s"
+      }
+    }
+  },
+  "speedMB": {
+    "description": "Speed formatting; mega bytes",
+    "message": "$SPEED$MB/s",
+    "placeholders": {
+      "speed": {
+        "content": "$1",
+        "example": "100.20MB/s"
+      }
+    }
+  },
   "statusNetwork_active_title": {
     "description": "Status bar tooltip; manager network icon",
     "message": "New Downloads will be started"
@@ -1135,6 +1229,18 @@
     "description": "Status bar tooltip; manager network icon",
     "message": "No new Downloads will be started"
   },
+  "subfolder": {
+    "description": "label text",
+    "message": "Subfolder:"
+  },
+  "subfolder_placeholder": {
+    "description": "placeholder text within an input box",
+    "message": "Place files in this subfolder within your downloads directory"
+  },
+  "title": {
+    "description": "Column text; Title label (short)",
+    "message": "Title"
+  },
   "toggle_selected_items": {
     "description": "Menu text; select",
     "message": "Toggle Check for Selected Items"
@@ -1166,5 +1272,13 @@
   "uncheck_selected_items": {
     "description": "Menu text; select",
     "message": "Uncheck Selected Items"
+  },
+  "unlimited": {
+    "description": "Option text; Prefs/Network",
+    "message": "Unlimited"
+  },
+  "useonlyonce": {
+    "description": "Label for Use-Once checkboxes",
+    "message": "Use Once"
   }
 }

_locales/hu/messages.json

@@ -124,7 +124,7 @@
     "description": "Table column in manager"
   },
   "conflict_overwrite": {
-    "message": "Felülírás",
+    "message": "Írd felül",
     "description": "Option text; prefs/general"
   },
   "conflict_prompt": {
@@ -132,7 +132,7 @@
     "description": "Option text; prefs/general"
   },
   "conflict_rename": {
-    "message": "Átnevezés",
+    "message": "Nevezd át",
     "description": "Option text; prefs/general"
   },
   "CRASH": {
@@ -191,6 +191,22 @@
     "message": "Törlés",
     "description": "button text"
   },
+  "deletefiles": {
+    "message": "Fájlok törlése",
+    "description": "menu action"
+  },
+  "deletefiles_button": {
+    "message": "Törlés",
+    "description": "button text"
+  },
+  "deletefiles_text": {
+    "message": "Biztos benne, hogy törli a következő fájlokat?",
+    "description": "messagebox text"
+  },
+  "deletefiles_title": {
+    "message": "Fájlok törlése",
+    "description": "messagebox title"
+  },
   "description": {
     "message": "Leírás",
     "description": "Description (keep it short); e.g. the description column in select"
@@ -275,10 +291,34 @@
     "message": "Érvénytelen URL",
     "description": "Error message; single window"
   },
+  "error_noabsolutepath": {
+    "message": "Abszolút útvonalak megadása az almappákhoz nem támogatott a böngészők által",
+    "description": "Error Message; select/single window"
+  },
+  "error_nodotsinpath": {
+    "message": "Pontok az almappákban nem támogatottak a böngészők által",
+    "description": "Error Message; select/single window"
+  },
   "error_noItemsSelected": {
     "message": "Nincs elem kiválasztva",
     "description": "Error Message; select window"
   },
+  "export": {
+    "message": "Exportálás fájlba",
+    "description": "menu text"
+  },
+  "export_aria2": {
+    "message": "Exportálás aria2 listaként",
+    "description": "menu text"
+  },
+  "export_metalink": {
+    "message": "Exportálás Metalink formátumba",
+    "description": "menu text"
+  },
+  "export_text": {
+    "message": "Exportálás szövegként",
+    "description": "menu text"
+  },
   "extensionDescription": {
     "message": "A tömeges letöltő a böngésződ számára",
     "description": "DownThemAll! tagline, displayed in about:addons; Please do NOT refer to a specific browser such as firefox, as we will probably support more than one"
@@ -331,6 +371,10 @@
     "message": "Erőltetett indítás",
     "description": "Menu text"
   },
+  "import": {
+    "message": "Importálás fájlból",
+    "description": "menu text"
+  },
   "information_title": {
     "message": "Információ",
     "description": "Used in message boxes"
@@ -384,7 +428,7 @@
     "description": "Menu text"
   },
   "manager_status_items": {
-    "message": "Elkészült $COMPLETE$ a $TOTAL$ letöltésből ($SHOWING$ kijelezve), $RUNNING$ folyamatban",
+    "message": "Elkészült $COMPLETE$ a(z) $TOTAL$ letöltésből ($SHOWING$ kijelezve), $RUNNING$ folyamatban",
     "description": "Status bar text; manager",
     "placeholders": {
       "complete": {
@@ -529,18 +573,34 @@
     "message": "Add hozzá az új letöltéseket szüneteltetve, ahelyett, hogy azonnal megkezdenéd a letöltésüket",
     "description": "Preferences/General"
   },
+  "pref_button_type": {
+    "message": "DownThemAll gomb:",
+    "description": "label"
+  },
+  "pref_button_type_dta": {
+    "message": "DownThemAll választás",
+    "description": "label"
+  },
+  "pref_button_type_manager": {
+    "message": "Kezelő megnyitása",
+    "description": "label"
+  },
+  "pref_button_type_popup": {
+    "message": "Felugró menü",
+    "description": "label"
+  },
+  "pref_button_type_turbo": {
+    "message": "OneClick!",
+    "description": "label"
+  },
   "pref_concurrent_downloads": {
-    "message": "Egyidejű letöltések",
+    "message": "Egyidejű letöltések száma",
     "description": "Preferences/Network"
   },
   "pref_finish_notification": {
     "message": "Értesíts, ha a letöltések befejeződtek",
     "description": "Preferences/General"
   },
-  "pref_global_turbo": {
-    "message": "A böngésző gomb inkább OneClick! legyen",
-    "description": "Preferences/General"
-  },
   "pref_hide_context": {
     "message": "Ne mutasd az általános menü elemeit",
     "description": "Preferences/General"
@@ -549,8 +609,12 @@
     "message": "Kezelő",
     "description": "Preferences/General; group text"
   },
+  "pref_manager_in_popup": {
+    "message": "Kezelő megnyitása új felugró ablakban",
+    "description": "checkbox text"
+  },
   "pref_manager_tooltip": {
-    "message": "Mutass tooltipeket a Kezelő lapokon",
+    "message": "Mutass tooltipeket a Kezelő lapjain",
     "description": "Preferences/General"
   },
   "pref_netglobal": {
@@ -558,7 +622,7 @@
     "description": "Preferences/General; group text"
   },
   "pref_open_manager_on_queue": {
-    "message": "Nyisd meg a Kezelő lapot a letöltések sorbaállítását követően",
+    "message": "Nyisd meg a Kezelőt a letöltések sorbaállítását követően",
     "description": "Preferences/General"
   },
   "pref_queueing": {
@@ -573,10 +637,22 @@
     "message": "Hiányzó letöltések eltávolítása újraindítást követően",
     "description": "Preferences/General"
   },
+  "pref_retries": {
+    "message": "Ideiglenes hibák esetén az újrapróbálkozások száma",
+    "description": "pref text"
+  },
+  "pref_retry_time": {
+    "message": "Újrapróbálkozás ennyi percenként",
+    "description": "pref text"
+  },
   "pref_show_urls": {
     "message": "Mutass URL-eket nevek helyett",
     "description": "Preferences/General"
   },
+  "pref_sounds": {
+    "message": "Hangok lejátszása",
+    "description": "checkbox text"
+  },
   "pref_text_links": {
     "message": "Keress hivatkozásokat a honlap szövegében (lassabb)",
     "description": "Preferences/General"
@@ -895,6 +971,20 @@
     "message": "Folytatás",
     "description": "Action for resuming a download"
   },
+  "retrying": {
+    "message": "Újrapróbálkozás",
+    "description": "Status text"
+  },
+  "retrying_error": {
+    "message": "Újrapróbálkozás - $ERROR$",
+    "description": "status text",
+    "placeholders": {
+      "error": {
+        "content": "$1",
+        "example": "Server Error"
+      }
+    }
+  },
   "running": {
     "message": "Folyamatban",
     "description": "Status text"
@@ -943,12 +1033,24 @@
     "message": "Átnevezési maszk beállítása",
     "description": "Menu text; select window"
   },
+  "set_mask_text": {
+    "message": "Új átnevezési maszk beállítása",
+    "description": "dialog text"
+  },
+  "set_referrer": {
+    "message": "Referrer beállítása",
+    "description": "menu text"
+  },
+  "set_referrer_text": {
+    "message": "Új referrer beállítása",
+    "description": "dialog text"
+  },
   "single_batchexamples": {
-    "message": "Kötegek támogatva vannak, pl.:",
+    "message": "Kötegelés támogatva van, pl.:",
     "description": "Header text; single window"
   },
   "single_header": {
-    "message": "Írj be egy letöltési URL-t (hivatkozást) és egyéb beállításokat",
+    "message": "Írjon be egy letöltési URL-t (hivatkozást) és adjon meg egyéb beállításokat",
     "description": "Header text; single window"
   },
   "single_title": {
@@ -1123,6 +1225,14 @@
     "message": "Nem lesznek új letöltések elindítva",
     "description": "Status bar tooltip; manager network icon"
   },
+  "subfolder": {
+    "message": "Almappa:",
+    "description": "label text"
+  },
+  "subfolder_placeholder": {
+    "message": "Fájlok elhelyezése ebbe az almappába a letöltések mappáján belül",
+    "description": "placeholder text within an input box"
+  },
   "title": {
     "message": "Cím",
     "description": "Column text; Title label (short)"
@@ -1166,5 +1276,9 @@
   "useonlyonce": {
     "message": "Egyszer használd",
     "description": "Label for Use-Once checkboxes"
+  },
+  "USER_CANCELED": {
+    "message": "Felhasználói megszakítás",
+    "description": "Error message"
   }
 }

_locales/id/messages.json

@@ -24,7 +24,7 @@
     "description": "Checkbox label"
   },
   "add_paused_question": {
-    "message": "Apa Anda ingin mengingat keputusan ini dan mulai sekarang tambahkan unduhan dalam kondisi terpause?",
+    "message": "Ingat keputusan ini dan tambahkan unduhan dalam kondisi terpause mulai sekarang?",
     "description": "Messagebox text"
   },
   "add_paused_title": {
@@ -175,6 +175,22 @@
     "message": "Hapus",
     "description": "button text"
   },
+  "deletefiles": {
+    "message": "Hapus Berkas",
+    "description": "menu action"
+  },
+  "deletefiles_button": {
+    "message": "Hapus",
+    "description": "button text"
+  },
+  "deletefiles_text": {
+    "message": "Hapus berkas-berkas berikut ini?",
+    "description": "messagebox text"
+  },
+  "deletefiles_title": {
+    "message": "Hapus Berkas",
+    "description": "messagebox title"
+  },
   "description": {
     "message": "Keterangan",
     "description": "Description (keep it short); e.g. the description column in select"
@@ -251,10 +267,34 @@
     "message": "URL Tidak Benar",
     "description": "Error message; single window"
   },
+  "error_noabsolutepath": {
+    "message": "Path absolut untuk subfolder tidak didukung oleh peramban",
+    "description": "Error Message; select/single window"
+  },
+  "error_nodotsinpath": {
+    "message": "Titik (.) di subfolder tidak didukung oleh peramban",
+    "description": "Error Message; select/single window"
+  },
   "error_noItemsSelected": {
     "message": "Tidak ada item terpilih",
     "description": "Error Message; select window"
   },
+  "export": {
+    "message": "Ekspor Ke Berkas",
+    "description": "menu text"
+  },
+  "export_aria2": {
+    "message": "Ekspor Sebagai Daftar aria2",
+    "description": "menu text"
+  },
+  "export_metalink": {
+    "message": "Ekspor Sebagai Metalink",
+    "description": "menu text"
+  },
+  "export_text": {
+    "message": "Ekspor Sebagai Teks",
+    "description": "menu text"
+  },
   "extensionDescription": {
     "message": "Pengunduh Masal untuk browser anda",
     "description": "DownThemAll! tagline, displayed in about:addons; Please do NOT refer to a specific browser such as firefox, as we will probably support more than one"
@@ -280,15 +320,15 @@
     "description": "Message box title"
   },
   "filter_expression": {
-    "message": "Ekspres-Filter",
+    "message": "Ekspresi",
     "description": "Message box label"
   },
   "filter_label": {
-    "message": "Label-Filter",
+    "message": "Label",
     "description": "Message box label"
   },
   "filter_types": {
-    "message": "Tipe-Filter",
+    "message": "Tipe",
     "description": "Message box label"
   },
   "filter_type_link": {
@@ -307,6 +347,10 @@
     "message": "Paksa Mulai",
     "description": "Menu text"
   },
+  "import": {
+    "message": "Impor Dari Berkas",
+    "description": "menu text"
+  },
   "information_title": {
     "message": "Informasi",
     "description": "Used in message boxes"
@@ -320,7 +364,7 @@
     "description": "Menu text"
   },
   "limited_to": {
-    "message": "Terbatas ke",
+    "message": "Batasi ke",
     "description": "Label text; used in prefs/network"
   },
   "links": {
@@ -362,11 +406,11 @@
     "description": "Status text; Used in the mask column, select window"
   },
   "missing": {
-    "message": "Tidak Ada",
+    "message": "Hilang",
     "description": "Status text in manager"
   },
   "move_bottom": {
-    "message": "Bawah",
+    "message": "Ke Bawah",
     "description": "Action for moving a download to the bottom"
   },
   "move_down": {
@@ -374,7 +418,7 @@
     "description": "Action for moving a download down"
   },
   "move_top": {
-    "message": "Atas",
+    "message": "Ke Atas",
     "description": "Action for moving a download to the top"
   },
   "move_up": {
@@ -461,6 +505,22 @@
     "message": "Tambahkan unduhan terpause, alih-alih langsung memulai mengunduh",
     "description": "Preferences/General"
   },
+  "pref_button_type": {
+    "message": "Tombol DownThemAll!:",
+    "description": "label"
+  },
+  "pref_button_type_dta": {
+    "message": "Pilihan DownThemAll!",
+    "description": "label"
+  },
+  "pref_button_type_manager": {
+    "message": "Buka Pengelola",
+    "description": "label"
+  },
+  "pref_button_type_popup": {
+    "message": "Menu popup",
+    "description": "label"
+  },
   "pref_concurrent_downloads": {
     "message": "Unduhan Bersamaan",
     "description": "Preferences/Network"
@@ -469,10 +529,6 @@
     "message": "Tampilkan pemberitahuan ketika antrian unduhan selesai",
     "description": "Preferences/General"
   },
-  "pref_global_turbo": {
-    "message": "Tombol peramban sebaiknya OneClick!",
-    "description": "Preferences/General"
-  },
   "pref_hide_context": {
     "message": "Jangan perlihatkan item menu general context",
     "description": "Preferences/General"
@@ -481,6 +537,10 @@
     "message": "Pengelola",
     "description": "Preferences/General; group text"
   },
+  "pref_manager_in_popup": {
+    "message": "Buka pengelola di jendela popup baru",
+    "description": "checkbox text"
+  },
   "pref_manager_tooltip": {
     "message": "Tampilkan tooltip di tab Pengelola",
     "description": "Preferences/General"
@@ -505,10 +565,22 @@
     "message": "Setelah restart, hapus unduhan yang tidak ada",
     "description": "Preferences/General"
   },
+  "pref_retries": {
+    "message": "Jumlah percobaan ulang ketika gagal mengunduh",
+    "description": "pref text"
+  },
+  "pref_retry_time": {
+    "message": "Coba setiap (dalam menit)",
+    "description": "pref text"
+  },
   "pref_show_urls": {
     "message": "Tampilan URL alih-alih Nama",
     "description": "Preferences/General"
   },
+  "pref_sounds": {
+    "message": "Bunyikan suara",
+    "description": "checkbox text"
+  },
   "pref_text_links": {
     "message": "Coba cari tautan di teks di situs web (lambat)",
     "description": "Preferences/General"
@@ -560,7 +632,7 @@
     "description": "Menu text"
   },
   "remove_batch_downloads_question": {
-    "message": "Hapus semua unduhan dari kumpulan yang sama dengan unduhan terpilih?",
+    "message": "Hapus semua unduhan dari batch yang sama dengan unduhan terpilih?",
     "description": "Messagebox text"
   },
   "remove_complete_downloads": {
@@ -600,7 +672,7 @@
     }
   },
   "remove_domain_downloads": {
-    "message": "Hapus Domain Ini",
+    "message": "Hapus Unduhan Dari Domain Ini",
     "description": "Menu text"
   },
   "remove_domain_downloads_question": {
@@ -630,7 +702,7 @@
     "description": "Messagebox text"
   },
   "remove_failed_downloads": {
-    "message": "Gagal Menghapus",
+    "message": "Hapus Unduhan Gagal",
     "description": "Menu text"
   },
   "remove_failed_downloads_question": {
@@ -648,11 +720,11 @@
     }
   },
   "remove_missing": {
-    "message": "Hapus Unduhan Yang Tidak Ada",
+    "message": "Hapus Unduhan Yang Hilang",
     "description": "Menu text"
   },
   "remove_missing_downloads_question": {
-    "message": "Hapus semua unduhan yang tidak ada?",
+    "message": "Hapus semua unduhan yang hilang?",
     "description": "Messagebox text"
   },
   "remove_paused_downloads": {
@@ -664,7 +736,7 @@
     "description": "Messagebox text"
   },
   "remove_selected_complete_downloads": {
-    "message": "Hapus Yang Selesai Di Pilihan",
+    "message": "Hapus Yang Selesai Dari Unduhan Terpilih",
     "description": "Menu text"
   },
   "remove_selected_complete_downloads_question": {
@@ -767,6 +839,10 @@
     "message": "Tanggal Ditambahkan - Detik",
     "description": "Mask text; see mask button"
   },
+  "renamer_tags": {
+    "message": "Penanda Mask Penamaan",
+    "description": "Mask text; see mask button"
+  },
   "renamer_text": {
     "message": "Teks Deskripsi",
     "description": "Mask text; see mask button"
@@ -783,6 +859,10 @@
     "message": "Tanggal Ditambahkan - Tahun",
     "description": "Mask text; see mask button"
   },
+  "renmask": {
+    "message": "Mask penamaan",
+    "description": "Renaming mask (long)"
+  },
   "reset": {
     "message": "Atur Ulang",
     "description": "Button text; pref window"
@@ -807,6 +887,20 @@
     "message": "Lanjutkan",
     "description": "Action for resuming a download"
   },
+  "retrying": {
+    "message": "Mengulang",
+    "description": "Status text"
+  },
+  "retrying_error": {
+    "message": "Mengulang - $ERROR$",
+    "description": "status text",
+    "placeholders": {
+      "error": {
+        "content": "$1",
+        "example": "Server Error"
+      }
+    }
+  },
   "running": {
     "message": "Berjalan",
     "description": "Status text"
@@ -851,6 +945,22 @@
     "message": "Tidak Diizinkan",
     "description": "Error message"
   },
+  "set_mask": {
+    "message": "Set Mask Penamaan",
+    "description": "Menu text; select window"
+  },
+  "set_mask_text": {
+    "message": "Tentukan mask penamaan baru",
+    "description": "dialog text"
+  },
+  "set_referrer": {
+    "message": "Tentukan Referrer",
+    "description": "menu text"
+  },
+  "set_referrer_text": {
+    "message": "Tentukan referrer baru",
+    "description": "dialog text"
+  },
   "single_batchexamples": {
     "message": "Batch bisa digunakan, misalnya:",
     "description": "Header text; single window"
@@ -971,6 +1081,10 @@
     "message": "Tidak ada Unduhan baru yang akan dimulai",
     "description": "Status bar tooltip; manager network icon"
   },
+  "subfolder_placeholder": {
+    "message": "Simpan berkas di subfolder berikut di dalam direktori unduhan Anda",
+    "description": "placeholder text within an input box"
+  },
   "title": {
     "message": "Judul",
     "description": "Column text; Title label (short)"
@@ -1014,5 +1128,9 @@
   "useonlyonce": {
     "message": "Gunakan Sekali",
     "description": "Label for Use-Once checkboxes"
+  },
+  "USER_CANCELED": {
+    "message": "Dibatalkan Pengguna",
+    "description": "Error message"
   }
 }

_locales/ko/messages.json

@@ -191,6 +191,22 @@
     "message": "삭제",
     "description": "button text"
   },
+  "deletefiles": {
+    "message": "파일 삭제",
+    "description": "menu action"
+  },
+  "deletefiles_button": {
+    "message": "삭제",
+    "description": "button text"
+  },
+  "deletefiles_text": {
+    "message": "정말 다음 파일(들)을 삭제하시겠습니까?",
+    "description": "messagebox text"
+  },
+  "deletefiles_title": {
+    "message": "파일 삭제",
+    "description": "messagebox title"
+  },
   "description": {
     "message": "설명",
     "description": "Description (keep it short); e.g. the description column in select"
@@ -275,10 +291,34 @@
     "message": "잘못된 URL",
     "description": "Error message; single window"
   },
+  "error_noabsolutepath": {
+    "message": "하위 폴더의 절대 경로는 브라우저에서 지원되지 않습니다",
+    "description": "Error Message; select/single window"
+  },
+  "error_nodotsinpath": {
+    "message": "하위 폴더의 점(.)은 브라우저에서 지원되지 않습니다",
+    "description": "Error Message; select/single window"
+  },
   "error_noItemsSelected": {
     "message": "선택된 항목 없음",
     "description": "Error Message; select window"
   },
+  "export": {
+    "message": "파일로 내보내기",
+    "description": "menu text"
+  },
+  "export_aria2": {
+    "message": "aria2 리스트로 내보내기",
+    "description": "menu text"
+  },
+  "export_metalink": {
+    "message": "메타링크로 내보내기",
+    "description": "menu text"
+  },
+  "export_text": {
+    "message": "텍스트로 내보내기",
+    "description": "menu text"
+  },
   "extensionDescription": {
     "message": "브라우저용 대량 다운로더",
     "description": "DownThemAll! tagline, displayed in about:addons; Please do NOT refer to a specific browser such as firefox, as we will probably support more than one"
@@ -331,6 +371,10 @@
     "message": "강제 시작",
     "description": "Menu text"
   },
+  "import": {
+    "message": "파일에서 가져오기",
+    "description": "menu text"
+  },
   "information_title": {
     "message": "정보",
     "description": "Used in message boxes"
@@ -529,6 +573,26 @@
     "message": "새 다운로드를 즉시 시작하는 대신 일시중지로 추가",
     "description": "Preferences/General"
   },
+  "pref_button_type": {
+    "message": "DownThemAll! 버튼:",
+    "description": "label"
+  },
+  "pref_button_type_dta": {
+    "message": "DownThemAll! 선택",
+    "description": "label"
+  },
+  "pref_button_type_manager": {
+    "message": "관리자 열기",
+    "description": "label"
+  },
+  "pref_button_type_popup": {
+    "message": "팝업 메뉴",
+    "description": "label"
+  },
+  "pref_button_type_turbo": {
+    "message": "OneClick!",
+    "description": "label"
+  },
   "pref_concurrent_downloads": {
     "message": "동시 다운로드",
     "description": "Preferences/Network"
@@ -537,10 +601,6 @@
     "message": "다운로드 대기열이 끝나면 알림 표시",
     "description": "Preferences/General"
   },
-  "pref_global_turbo": {
-    "message": "브라우저 버튼을 OneClick!으로 작동",
-    "description": "Preferences/General"
-  },
   "pref_hide_context": {
     "message": "일반 컨텍스트 메뉴 항목 표시 안 함",
     "description": "Preferences/General"
@@ -549,6 +609,10 @@
     "message": "관리자",
     "description": "Preferences/General; group text"
   },
+  "pref_manager_in_popup": {
+    "message": "새 팝업 창에 관리자 열기",
+    "description": "checkbox text"
+  },
   "pref_manager_tooltip": {
     "message": "관리자 탭에서 툴팁 표시",
     "description": "Preferences/General"
@@ -573,10 +637,22 @@
     "message": "다시 시작한 후 누락된 다운로드 제거",
     "description": "Preferences/General"
   },
+  "pref_retries": {
+    "message": "일시적인 오류에 대한 다운로드 재시도 횟수",
+    "description": "pref text"
+  },
+  "pref_retry_time": {
+    "message": "재시도 간격 (분)",
+    "description": "pref text"
+  },
   "pref_show_urls": {
     "message": "이름 대신 URL 표시",
     "description": "Preferences/General"
   },
+  "pref_sounds": {
+    "message": "소리 재생",
+    "description": "checkbox text"
+  },
   "pref_text_links": {
     "message": "웹 사이트 텍스트에서 링크를 찾도록 시도 (느림)",
     "description": "Preferences/General"
@@ -895,6 +971,20 @@
     "message": "계속",
     "description": "Action for resuming a download"
   },
+  "retrying": {
+    "message": "재시도중",
+    "description": "Status text"
+  },
+  "retrying_error": {
+    "message": "재시도중 - $ERROR$",
+    "description": "status text",
+    "placeholders": {
+      "error": {
+        "content": "$1",
+        "example": "Server Error"
+      }
+    }
+  },
   "running": {
     "message": "실행중",
     "description": "Status text"
@@ -943,6 +1033,18 @@
     "message": "이름 바꾸기 마스크 설정",
     "description": "Menu text; select window"
   },
+  "set_mask_text": {
+    "message": "새 이름 바꾸기 마스크 설정",
+    "description": "dialog text"
+  },
+  "set_referrer": {
+    "message": "참조 페이지 설정",
+    "description": "menu text"
+  },
+  "set_referrer_text": {
+    "message": "새 참조 페이지 설정",
+    "description": "dialog text"
+  },
   "single_batchexamples": {
     "message": "일괄 처리가 지원됩니다, 예:",
     "description": "Header text; single window"
@@ -1123,6 +1225,14 @@
     "message": "새 다운로드가 시작되지 않습니다",
     "description": "Status bar tooltip; manager network icon"
   },
+  "subfolder": {
+    "message": "하위 폴더",
+    "description": "label text"
+  },
+  "subfolder_placeholder": {
+    "message": "다운로드 디렉토리 내의 이 하위 폴더에 파일을 저장합니다",
+    "description": "placeholder text within an input box"
+  },
   "title": {
     "message": "제목",
     "description": "Column text; Title label (short)"
@@ -1166,5 +1276,9 @@
   "useonlyonce": {
     "message": "한번만",
     "description": "Label for Use-Once checkboxes"
+  },
+  "USER_CANCELED": {
+    "message": "사용자 취소",
+    "description": "Error message"
   }
 }

_locales/ru/messages.json

@@ -12,7 +12,7 @@
     "description": "Action: Add paused"
   },
   "add_download": {
-    "message": "Добавить закачку",
+    "message": "добавить закачку",
     "description": "Action for adding a download"
   },
   "add_new": {
@@ -191,6 +191,22 @@
     "message": "Удалить",
     "description": "button text"
   },
+  "deletefiles": {
+    "message": "Удалить файлы",
+    "description": "menu action"
+  },
+  "deletefiles_button": {
+    "message": "Удалить",
+    "description": "button text"
+  },
+  "deletefiles_text": {
+    "message": "Точно удалить эти файлы?",
+    "description": "messagebox text"
+  },
+  "deletefiles_title": {
+    "message": "Удаление файлов",
+    "description": "messagebox title"
+  },
   "description": {
     "message": "Описание",
     "description": "Description (keep it short); e.g. the description column in select"
@@ -275,10 +291,34 @@
     "message": "Неправильная ссылка",
     "description": "Error message; single window"
   },
+  "error_noabsolutepath": {
+    "message": "Полные пути к папкам не поддерживаются браузерами",
+    "description": "Error Message; select/single window"
+  },
+  "error_nodotsinpath": {
+    "message": "Точки (.) в названии папок не поддерживаются браузерами",
+    "description": "Error Message; select/single window"
+  },
   "error_noItemsSelected": {
     "message": "Ничего не выбрано",
     "description": "Error Message; select window"
   },
+  "export": {
+    "message": "Экспортировать в файл",
+    "description": "menu text"
+  },
+  "export_aria2": {
+    "message": "Экспортировать как список для aria2",
+    "description": "menu text"
+  },
+  "export_metalink": {
+    "message": "Экспортировать как Metalink",
+    "description": "menu text"
+  },
+  "export_text": {
+    "message": "Экспортировать как текст",
+    "description": "menu text"
+  },
   "extensionDescription": {
     "message": "Универсальная качалка для вашего браузера",
     "description": "DownThemAll! tagline, displayed in about:addons; Please do NOT refer to a specific browser such as firefox, as we will probably support more than one"
@@ -331,6 +371,10 @@
     "message": "Принудительный старт",
     "description": "Menu text"
   },
+  "import": {
+    "message": "Импортировать из файла",
+    "description": "menu text"
+  },
   "information_title": {
     "message": "Информация",
     "description": "Used in message boxes"
@@ -529,6 +573,26 @@
     "message": "Добавлять закачки приостановленными, вместо того чтобы качать сразу",
     "description": "Preferences/General"
   },
+  "pref_button_type": {
+    "message": "Кнопка DownThemAll!",
+    "description": "label"
+  },
+  "pref_button_type_dta": {
+    "message": "DownThemAll! выделенного",
+    "description": "label"
+  },
+  "pref_button_type_manager": {
+    "message": "Открыть менеджер",
+    "description": "label"
+  },
+  "pref_button_type_popup": {
+    "message": "Всплывающее меню",
+    "description": "label"
+  },
+  "pref_button_type_turbo": {
+    "message": "OneClick!",
+    "description": "label"
+  },
   "pref_concurrent_downloads": {
     "message": "Настройки/Сеть",
     "description": "Preferences/Network"
@@ -537,10 +601,6 @@
     "message": "Показывать уведомление когда список закачек завешен",
     "description": "Preferences/General"
   },
-  "pref_global_turbo": {
-    "message": "Использовать OneClick! по умолчанию на кнопке в браузере",
-    "description": "Preferences/General"
-  },
   "pref_hide_context": {
     "message": "Не добавлять пункты в общее контекстное меню",
     "description": "Preferences/General"
@@ -549,6 +609,10 @@
     "message": "Менеджер",
     "description": "Preferences/General; group text"
   },
+  "pref_manager_in_popup": {
+    "message": "Открывать менеджер в новом всплывающем окне",
+    "description": "checkbox text"
+  },
   "pref_manager_tooltip": {
     "message": "Показывать подсказки на вкладках менеджера",
     "description": "Preferences/General"
@@ -573,10 +637,22 @@
     "message": "Удалять неудавшиеся закачки после перезапуска",
     "description": "Preferences/General"
   },
+  "pref_retries": {
+    "message": "Сколько раз пробовать перезапустить закачку при некритичных сбоях",
+    "description": "pref text"
+  },
+  "pref_retry_time": {
+    "message": "Как часто пробовать перезапустить закачку (в минутах)",
+    "description": "pref text"
+  },
   "pref_show_urls": {
     "message": "Показывать ссылки вместо имён",
     "description": "Preferences/General"
   },
+  "pref_sounds": {
+    "message": "Проигрывать звуки",
+    "description": "checkbox text"
+  },
   "pref_text_links": {
     "message": "Пытаться обнаружить ссылки в тексте на сайте",
     "description": "Preferences/General"
@@ -895,6 +971,20 @@
     "message": "Продолжить",
     "description": "Action for resuming a download"
   },
+  "retrying": {
+    "message": "Перезапуск",
+    "description": "Status text"
+  },
+  "retrying_error": {
+    "message": "Перезапуск - $ERROR$",
+    "description": "status text",
+    "placeholders": {
+      "error": {
+        "content": "$1",
+        "example": "Server Error"
+      }
+    }
+  },
   "running": {
     "message": "В процессе",
     "description": "Status text"
@@ -943,6 +1033,18 @@
     "message": "Задать маску переименования",
     "description": "Menu text; select window"
   },
+  "set_mask_text": {
+    "message": "Задать новую маску переименования",
+    "description": "dialog text"
+  },
+  "set_referrer": {
+    "message": "Задать реферера",
+    "description": "menu text"
+  },
+  "set_referrer_text": {
+    "message": "Задать нового реферера",
+    "description": "dialog text"
+  },
   "single_batchexamples": {
     "message": "Можно задать группы, к примеру:",
     "description": "Header text; single window"
@@ -1123,6 +1225,14 @@
     "message": "Новые закачки запускаться не будут",
     "description": "Status bar tooltip; manager network icon"
   },
+  "subfolder": {
+    "message": "Подпапка",
+    "description": "label text"
+  },
+  "subfolder_placeholder": {
+    "message": "Размещать файлы в подпапке выбранного пути для закачек",
+    "description": "placeholder text within an input box"
+  },
   "title": {
     "message": "Заголовок",
     "description": "Column text; Title label (short)"
@@ -1166,5 +1276,9 @@
   "useonlyonce": {
     "message": "Только сейчас",
     "description": "Label for Use-Once checkboxes"
+  },
+  "USER_CANCELED": {
+    "message": "Отменено пользователем",
+    "description": "Error message"
   }
 }

data/prefs.json

@@ -1,8 +1,10 @@
 {
-	"global-turbo": false,
+	"button-type": "popup",
+	"manager-in-popup": false,
 	"concurrent": 4,
 	"queue-notification": true,
 	"finish-notification": true,
+	"sounds": true,
 	"open-manager-on-queue": true,
 	"text-links": true,
 	"add-paused": false,
@@ -13,6 +15,8 @@
 	"tooltip": true,
 	"show-urls": false,
 	"remove-missing-on-init": false,
+	"retries": 5,
+	"retry-time": 10,
 	"limits": [
 		{
 			"domain": "*",

lib/api.ts

@@ -11,7 +11,7 @@ import { getManager } from "./manager/man";
 import { select } from "./select";
 import { single } from "./single";
 import { Notification } from "./notifications";
-import { MASK, FASTFILTER } from "./recentlist";
+import { MASK, FASTFILTER, SUBFOLDER } from "./recentlist";
 import { openManager } from "./windowutils";
 import { _ } from "./i18n";
 
@@ -19,6 +19,7 @@ const MAX_BATCH = 10000;
 
 export interface QueueOptions {
   mask?: string;
+  subfolder?: string;
   paused?: boolean;
 }
 
@@ -28,8 +29,9 @@ export const API = new class APIImpl {
   }
 
   async queue(items: BaseItem[], options: QueueOptions) {
-    await MASK.init();
+    await Promise.all([MASK.init(), SUBFOLDER.init()]);
     const {mask = MASK.current} = options;
+    const {subfolder = SUBFOLDER.current} = options;
 
     const {paused = false} = options;
     const defaults: any = {
@@ -46,6 +48,7 @@ export const API = new class APIImpl {
       private: false,
       postData: null,
       mask,
+      subfolder,
       date: Date.now(),
       paused
     };
@@ -117,6 +120,10 @@ export const API = new class APIImpl {
       await FASTFILTER.init();
       await FASTFILTER.push(options.fast);
     }
+    if (typeof options.subfolder === "string" && !options.subfolderOnce) {
+      await SUBFOLDER.init();
+      await SUBFOLDER.push(options.subfolder);
+    }
     if (typeof options.type === "string") {
       await Prefs.set("last-type", options.type);
     }

lib/background.ts

@@ -48,6 +48,9 @@ const CHROME_CONTEXTS = Object.freeze(new Set([
 
 async function runContentJob(tab: Tab, file: string, msg: any) {
   try {
+    if (tab && tab.incognito && msg) {
+      msg.private = tab.incognito;
+    }
     const res = await tabs.executeScript(tab.id, {
       file,
       allFrames: true,
@@ -133,35 +136,6 @@ class Handler {
 }
 
 locale.then(() => {
-  new class Action extends Handler {
-    constructor() {
-      super();
-      this.onClicked = this.onClicked.bind(this);
-      action.onClicked.addListener(this.onClicked);
-    }
-
-    async onClicked(tab: {id: number}) {
-      if (!tab.id) {
-        return;
-      }
-      try {
-        await this.processResults(
-          true,
-          await runContentJob(
-            tab, "/bundles/content-gather.js", {
-              type: "DTA:gather",
-              selectionOnly: false,
-              textLinks: await Prefs.get("text-links", true),
-              schemes: Array.from(ALLOWED_SCHEMES.values()),
-              transferable: TRANSFERABLE_PROPERTIES,
-            }));
-      }
-      catch (ex) {
-        console.error(ex);
-      }
-    }
-  }();
-
   const menuHandler = new class Menus extends Handler {
     constructor() {
       super();
@@ -418,7 +392,7 @@ locale.then(() => {
       }
     }
 
-    async enumulate(action: string) {
+    async emulate(action: string) {
       const tab = await tabs.query({
         active: true,
         currentWindow: true,
@@ -540,34 +514,88 @@ locale.then(() => {
     }
   }();
 
-  Bus.on("do-regular", () => menuHandler.enumulate("DTARegular"));
-  Bus.on("do-regular-all", () => menuHandler.enumulate("DTARegularAll"));
-  Bus.on("do-turbo", () => menuHandler.enumulate("DTATurbo"));
-  Bus.on("do-turbo-all", () => menuHandler.enumulate("DTATurboAll"));
+  new class Action extends Handler {
+    constructor() {
+      super();
+      this.onClicked = this.onClicked.bind(this);
+      action.onClicked.addListener(this.onClicked);
+      Prefs.get("button-type", false).then(v => this.adjust(v));
+      Prefs.on("button-type", (prefs, key, value) => {
+        this.adjust(value);
+      });
+    }
+
+    adjust(type: string) {
+      action.setPopup({
+        popup: type !== "popup" ? "" : "/windows/popup.html"
+      });
+      let icons;
+      switch (type) {
+      case "popup":
+        icons = {
+          16: "/style/icon16.png",
+          32: "/style/icon32.png",
+          48: "/style/icon48.png",
+          64: "/style/icon64.png",
+          96: "/style/icon96.png",
+          128: "/style/icon128.png",
+          256: "/style/icon256.png"
+        };
+        break;
+
+      case "dta":
+        icons = {
+          16: "/style/button-regular.png",
+          32: "/style/button-regular@2x.png",
+        };
+        break;
+
+      case "turbo":
+        icons = {
+          16: "/style/button-turbo.png",
+          32: "/style/button-turbo@2x.png",
+        };
+        break;
+
+      case "manager":
+        icons = {
+          16: "/style/button-manager.png",
+          32: "/style/button-manager@2x.png",
+        };
+        break;
+      }
+      action.setIcon({path: icons});
+    }
+
+    async onClicked() {
+      switch (await Prefs.get("button-type")) {
+      case "popup":
+        break;
+
+      case "dta":
+        menuHandler.emulate("DTARegular");
+        break;
+
+      case "turbo":
+        menuHandler.emulate("DTATurbo");
+        break;
+
+      case "manager":
+        menuHandler.emulate("DTAManager");
+        break;
+      }
+    }
+  }();
+
+
+  Bus.on("do-regular", () => menuHandler.emulate("DTARegular"));
+  Bus.on("do-regular-all", () => menuHandler.emulate("DTARegularAll"));
+  Bus.on("do-turbo", () => menuHandler.emulate("DTATurbo"));
+  Bus.on("do-turbo-all", () => menuHandler.emulate("DTATurboAll"));
   Bus.on("do-single", () => API.singleRegular(null));
   Bus.on("open-manager", () => openManager(true));
   Bus.on("open-prefs", () => openPrefs());
 
-  function adjustAction(globalTurbo: boolean) {
-    action.setPopup({
-      popup: globalTurbo ? "" : "/windows/popup.html"
-    });
-    action.setIcon({
-      path: globalTurbo ? {
-        16: "/style/button-turbo.png",
-        32: "/style/button-turbo@2x.png",
-      } : {
-        16: "/style/icon16.png",
-        32: "/style/icon32.png",
-        48: "/style/icon48.png",
-        64: "/style/icon64.png",
-        96: "/style/icon96.png",
-        128: "/style/icon128.png",
-        256: "/style/icon256.png"
-      }
-    });
-  }
-
   (async function init() {
     const urlBase = runtime.getURL("");
     history.onVisited.addListener(({url}: {url: string}) => {
@@ -607,10 +635,6 @@ locale.then(() => {
     }
 
     await Prefs.set("last-run", new Date());
-    Prefs.get("global-turbo", false).then(v => adjustAction(v));
-    Prefs.on("global-turbo", (prefs, key, value) => {
-      adjustAction(value);
-    });
     await filters();
     await getManager();
   })().catch(ex => {

lib/browser.ts

@@ -19,6 +19,7 @@ export interface MessageSender {
 
 export interface Tab {
   id?: number;
+  incognito?: boolean;
 }
 
 export interface MenuClickInfo {
@@ -39,9 +40,62 @@ export interface RawPort {
   postMessage: (message: any) => void;
 }
 
+interface WebRequestFilter {
+  urls?: string[];
+}
+
+interface WebRequestListener {
+  addListener(
+    callback: Function,
+    filter: WebRequestFilter,
+    extraInfoSpec: string[]
+    ): void;
+  removeListener(callback: Function): void;
+}
+
+type Header = {name: string; value: string};
+
+export interface DownloadOptions {
+  conflictAction: string;
+  filename: string;
+  saveAs: boolean;
+  url: string;
+  method?: string;
+  body?: string;
+  incognito?: boolean;
+  headers: Header[];
+}
+
+export interface DownloadsQuery {
+  id?: number;
+}
+
+interface Downloads {
+  download(download: DownloadOptions): Promise<number>;
+  open(manId: number): Promise<void>;
+  show(manId: number): Promise<void>;
+  pause(manId: number): Promise<void>;
+  resume(manId: number): Promise<void>;
+  cancel(manId: number): Promise<void>;
+  erase(query: DownloadsQuery): Promise<void>;
+  search(query: DownloadsQuery): Promise<any[]>;
+  getFileIcon(id: number, options?: any): Promise<string>;
+  setShelfEnabled(state: boolean): void;
+  removeFile(manId: number): Promise<void>;
+  onCreated: ExtensionListener;
+  onChanged: ExtensionListener;
+  onErased: ExtensionListener;
+}
+
+interface WebRequest {
+  onBeforeSendHeaders: WebRequestListener;
+  onSendHeaders: WebRequestListener;
+  onHeadersReceived: WebRequestListener;
+}
+
 export const {browserAction} = polyfill;
 export const {contextMenus} = polyfill;
-export const {downloads} = polyfill;
+export const {downloads}: {downloads: Downloads} = polyfill;
 export const {extension} = polyfill;
 export const {history} = polyfill;
 export const {menus} = polyfill;
@@ -51,7 +105,7 @@ export const {sessions} = polyfill;
 export const {storage} = polyfill;
 export const {tabs} = polyfill;
 export const {webNavigation} = polyfill;
-export const {webRequest} = polyfill;
+export const {webRequest}: {webRequest: WebRequest} = polyfill;
 export const {windows} = polyfill;
 
 export const CHROME = navigator.appVersion.includes("Chrome/");

lib/db.ts

@@ -2,6 +2,9 @@
 
 // eslint-disable-next-line no-unused-vars
 import { BaseItem } from "./item";
+// eslint-disable-next-line no-unused-vars
+import { Download } from "./manager/download";
+import { RUNNING, QUEUED, RETRYING } from "./manager/state";
 
 // License: MIT
 
@@ -69,7 +72,7 @@ export const DB = new class DB {
     return await new Promise(this.getAllInternal);
   }
 
-  saveItemsInternal(items: any[], resolve: Function, reject: Function) {
+  saveItemsInternal(items: Download[], resolve: Function, reject: Function) {
     if (!items || !items.length || !this.db) {
       resolve();
       return;
@@ -83,9 +86,13 @@ export const DB = new class DB {
         if (item.private) {
           continue;
         }
-        const req = store.put(item.toJSON());
+        const json = item.toJSON();
+        if (item.state === RUNNING || item.state === RETRYING) {
+          json.state = QUEUED;
+        }
+        const req = store.put(json);
         if (!("dbId" in item) || item.dbId < 0) {
-          req.onsuccess = () => item.dbId = req.result;
+          req.onsuccess = () => item.dbId = req.result as number;
         }
       }
     }
@@ -94,7 +101,7 @@ export const DB = new class DB {
     }
   }
 
-  async saveItems(items: any[]) {
+  async saveItems(items: Download[]) {
     await this.init();
     return await new Promise(this.saveItemsInternal.bind(this, items));
   }

lib/imex.ts

@@ -0,0 +1,247 @@
+"use strict";
+// License: MIT
+
+import { getTextLinks } from "./textlinks";
+// eslint-disable-next-line no-unused-vars
+import { BaseItem } from "./item";
+import { ALLOWED_SCHEMES } from "./constants";
+
+export const NS_METALINK_RFC5854 = "urn:ietf:params:xml:ns:metalink";
+export const NS_DTA = "http://www.downthemall.net/properties#";
+
+function parseNum(
+    file: Element,
+    attr: string,
+    defaultValue: number,
+    ns = NS_METALINK_RFC5854) {
+  const val = file.getAttributeNS(ns, attr);
+  if (!val) {
+    return defaultValue + 1;
+  }
+  const num = parseInt(val, 10);
+  if (isFinite(num)) {
+    return num;
+  }
+  return defaultValue + 1;
+}
+
+function importMeta4(data: string) {
+  const parser = new DOMParser();
+  const document = parser.parseFromString(data, "text/xml");
+  const {documentElement} = document;
+  const items: BaseItem[] = [];
+  let batch = 0;
+  for (const file of documentElement.querySelectorAll("file")) {
+    try {
+      const url = Array.from(file.querySelectorAll("url")).map(u => {
+        try {
+          const {textContent} = u;
+          if (!textContent) {
+            return null;
+          }
+          const url = new URL(textContent);
+          if (!ALLOWED_SCHEMES.has(url.protocol)) {
+            return null;
+          }
+          const prio = parseNum(u, "priority", 0);
+          return {
+            url,
+            prio
+          };
+        }
+        catch {
+          return null;
+        }
+      }).filter(u => !!u).reduce((p, c) => {
+        if (!c) {
+          return null;
+        }
+        if (!p || p.prio < c.prio) {
+          return c;
+        }
+        return p;
+      });
+      if (!url) {
+        continue;
+      }
+      batch = parseNum(file, "num", batch, NS_DTA);
+      const idx = parseNum(file, "idx", 0, NS_DTA);
+      const item: BaseItem = {
+        url: url.url.toString(),
+        usable: decodeURIComponent(url.url.toString()),
+        batch,
+        idx
+      };
+      const ref = file.getAttributeNS(NS_DTA, "referrer");
+      if (ref) {
+        item.referrer = ref;
+        item.usableReferrer = decodeURIComponent(ref);
+      }
+      const mask = file.getAttributeNS(NS_DTA, "mask");
+      if (mask) {
+        item.mask = mask;
+      }
+      items.push(item);
+    }
+    catch (ex) {
+      console.error("Failed to import file", ex);
+    }
+  }
+  return items;
+}
+
+function parseKV(current: BaseItem, line: string) {
+  const [k, v] = line.split("=", 2);
+  switch (k.toLocaleLowerCase().trim()) {
+  case "referer": {
+    const rurls = getTextLinks(v);
+    if (rurls && rurls.length) {
+      current.referrer = rurls.pop();
+      current.usableReferrer = decodeURIComponent(current.referrer || "");
+    }
+    break;
+  }
+  }
+}
+
+export function importText(data: string) {
+  if (data.includes(NS_METALINK_RFC5854)) {
+    return importMeta4(data);
+  }
+  const splitter = /(.+)\n|(.+)$/g;
+  const spacer = /^\s+/;
+  let match;
+  let current: BaseItem | undefined = undefined;
+  let idx = 0;
+  const items = [];
+  while ((match = splitter.exec(data)) !== null) {
+    try {
+      const line = match[0].trimRight();
+      if (!line) {
+        continue;
+      }
+      if (spacer.test(line)) {
+        if (!current) {
+          continue;
+        }
+        parseKV(current, line);
+        continue;
+      }
+      const urls = getTextLinks(line);
+      if (!urls || !urls.length) {
+        continue;
+      }
+      current = {
+        url: urls[0],
+        usable: decodeURIComponent(urls[0]),
+        idx: ++idx
+      };
+      items.push(current);
+    }
+    catch (ex) {
+      current = undefined;
+      console.error("Failed to import", ex);
+    }
+  }
+  return items;
+}
+
+export interface Exporter {
+  fileName: string;
+  getText(items: BaseItem[]): string;
+}
+
+class TextExporter {
+  readonly fileName: string;
+
+  constructor() {
+    this.fileName = "links.txt";
+  }
+
+  getText(items: BaseItem[]) {
+    const lines = [];
+    for (const item of items) {
+      lines.push(item.url);
+    }
+    return lines.join("\n");
+  }
+}
+
+class Aria2Exporter {
+  readonly fileName: string;
+
+  constructor() {
+    this.fileName = "links.aria2.txt";
+  }
+
+  getText(items: BaseItem[]) {
+    const lines = [];
+    for (const item of items) {
+      lines.push(item.url);
+      if (item.referrer) {
+        lines.push(`  referer=${item.referrer}`);
+      }
+    }
+    return lines.join("\n");
+  }
+}
+
+class MetalinkExporter {
+  readonly fileName: string;
+
+  constructor() {
+    this.fileName = "links.meta4";
+  }
+
+  getText(items: BaseItem[]) {
+    const document = window.document.implementation.
+      createDocument(NS_METALINK_RFC5854, "metalink", null);
+    const root = document.documentElement;
+    root.setAttributeNS(NS_DTA, "generator", "DownThemAll!");
+    root.appendChild(document.createComment(
+      "metalink as exported by DownThemAll!",
+    ));
+
+    for (const item of items) {
+      const aitem = item as any;
+      const f = document.createElementNS(NS_METALINK_RFC5854, "file");
+      f.setAttribute("name", aitem.currentName);
+      if (item.batch) {
+        f.setAttributeNS(NS_DTA, "num", item.batch.toString());
+      }
+      if (item.idx) {
+        f.setAttributeNS(NS_DTA, "idx", item.idx.toString());
+      }
+      if (item.referrer) {
+        f.setAttributeNS(NS_DTA, "referrer", item.referrer);
+      }
+      if (item.mask) {
+        f.setAttributeNS(NS_DTA, "mask", item.mask);
+      }
+
+      if (item.description) {
+        const n = document.createElementNS(NS_METALINK_RFC5854, "description");
+        n.textContent = item.description;
+        f.appendChild(n);
+      }
+
+      const u = document.createElementNS(NS_METALINK_RFC5854, "url");
+      u.textContent = item.url;
+      f.appendChild(u);
+
+      if (aitem.totalSize > 0) {
+        const s = document.createElementNS(NS_METALINK_RFC5854, "size");
+        s.textContent = aitem.totalSize.toString();
+        f.appendChild(s);
+      }
+      root.appendChild(f);
+    }
+    let xml = "<?xml version=\"1.0\" encoding=\"utf-8\"?>\n";
+    xml += root.outerHTML;
+    return xml;
+  }
+}
+
+export const textExporter = new TextExporter();
+export const aria2Exporter = new Aria2Exporter();
+export const metalinkExporter = new MetalinkExporter();

lib/ipreg.ts

@@ -0,0 +1,4 @@
+"use strict";
+// License: MIT
+
+export const IPReg = /^(?:(?:[0-9]|[1-9][0-9]|1[0-9][0-9]|2[0-4][0-9]|25[0-5])[.]){3}(?:[0-9]|[1-9][0-9]|1[0-9][0-9]|2[0-4][0-9]|25[0-5])$|^(?:(?:(?:[0-9a-fA-F]{1,4}):){7}(?:(?:[0-9a-fA-F]{1,4})|:)|(?:(?:[0-9a-fA-F]{1,4}):){6}(?:((?:[0-9]|[1-9][0-9]|1[0-9][0-9]|2[0-4][0-9]|25[0-5])[.]){3}(?:[0-9]|[1-9][0-9]|1[0-9][0-9]|2[0-4][0-9]|25[0-5])|:(?:[0-9a-fA-F]{1,4})|:)|(?:(?:[0-9a-fA-F]{1,4}):){5}(?::((?:[0-9]|[1-9][0-9]|1[0-9][0-9]|2[0-4][0-9]|25[0-5])[.]){3}(?:[0-9]|[1-9][0-9]|1[0-9][0-9]|2[0-4][0-9]|25[0-5])|(:(?:[0-9a-fA-F]{1,4})){1,2}|:)|(?:(?:[0-9a-fA-F]{1,4}):){4}(?:(:(?:[0-9a-fA-F]{1,4})){0,1}:((?:[0-9]|[1-9][0-9]|1[0-9][0-9]|2[0-4][0-9]|25[0-5])[.]){3}(?:[0-9]|[1-9][0-9]|1[0-9][0-9]|2[0-4][0-9]|25[0-5])|(:(?:[0-9a-fA-F]{1,4})){1,3}|:)|(?:(?:[0-9a-fA-F]{1,4}):){3}(?:(:(?:[0-9a-fA-F]{1,4})){0,2}:((?:[0-9]|[1-9][0-9]|1[0-9][0-9]|2[0-4][0-9]|25[0-5])[.]){3}(?:[0-9]|[1-9][0-9]|1[0-9][0-9]|2[0-4][0-9]|25[0-5])|(:(?:[0-9a-fA-F]{1,4})){1,4}|:)|(?:(?:[0-9a-fA-F]{1,4}):){2}(?:(:(?:[0-9a-fA-F]{1,4})){0,3}:((?:[0-9]|[1-9][0-9]|1[0-9][0-9]|2[0-4][0-9]|25[0-5])[.]){3}(?:[0-9]|[1-9][0-9]|1[0-9][0-9]|2[0-4][0-9]|25[0-5])|(:(?:[0-9a-fA-F]{1,4})){1,5}|:)|(?:(?:[0-9a-fA-F]{1,4}):){1}(?:(:(?:[0-9a-fA-F]{1,4})){0,4}:((?:[0-9]|[1-9][0-9]|1[0-9][0-9]|2[0-4][0-9]|25[0-5])[.]){3}(?:[0-9]|[1-9][0-9]|1[0-9][0-9]|2[0-4][0-9]|25[0-5])|(:(?:[0-9a-fA-F]{1,4})){1,6}|:)|(?::((?::(?:[0-9a-fA-F]{1,4})){0,5}:((?:[0-9]|[1-9][0-9]|1[0-9][0-9]|2[0-4][0-9]|25[0-5])[.]){3}(?:[0-9]|[1-9][0-9]|1[0-9][0-9]|2[0-4][0-9]|25[0-5])|(?::(?:[0-9a-fA-F]{1,4})){1,7}|:)))(%[0-9a-zA-Z]{1,})?$/;

lib/item.ts

@@ -15,6 +15,7 @@ export interface BaseItem {
   batch?: number;
   idx: number;
   mask?: string;
+  subfolder?: string;
   startDate?: number;
   private?: boolean;
   postData?: string;
@@ -27,6 +28,7 @@ const OPTIONPROPS = Object.freeze([
   "fileName",
   "batch", "idx",
   "mask",
+  "subfolder",
   "startDate",
   "private",
   "postData",

lib/manager/basedownload.ts

@@ -5,6 +5,8 @@
 import { parsePath, URLd } from "../util";
 import { QUEUED, RUNNING, PAUSED } from "./state";
 import Renamer from "./renamer";
+// eslint-disable-next-line no-unused-vars
+import { BaseItem } from "../item";
 
 const SAVEDPROPS = [
   "state",
@@ -14,6 +16,7 @@ const SAVEDPROPS = [
   "usableReferrer",
   "fileName",
   "mask",
+  "subfolder",
   "date",
   // batches
   "batch",
@@ -48,7 +51,9 @@ const DEFAULTS = {
   written: 0,
   manId: 0,
   mime: "",
-  prerolled: false
+  prerolled: false,
+  retries: 0,
+  deadline: 0
 };
 
 let sessionId = 0;
@@ -103,9 +108,13 @@ export class BaseDownload {
 
   public mask: string;
 
+  public subfolder: string;
+
   public prerolled: boolean;
 
-  constructor(options: any) {
+  public retries: number;
+
+  constructor(options: BaseItem) {
     Object.assign(this, DEFAULTS);
     this.assign(options);
     if (this.state === RUNNING) {
@@ -113,14 +122,16 @@ export class BaseDownload {
     }
     this.sessionId = ++sessionId;
     this.renamer = new Renamer(this);
+    this.retries = 0;
   }
 
-  assign(options: any) {
+  assign(options: BaseItem) {
     // eslint-disable-next-line @typescript-eslint/no-this-alias
     const self: any = this;
+    const other: any = options;
     for (const prop of SAVEDPROPS) {
       if (prop in options) {
-        self[prop] = options[prop];
+        self[prop] = other[prop];
       }
     }
     this.uURL = new URL(this.url) as URLd;
@@ -182,6 +193,7 @@ export class BaseDownload {
     rv.currentName = this.browserName || rv.destName || rv.finalName;
     rv.error = this.error;
     rv.ext = this.renamer.p_ext;
+    rv.retries = this.retries;
     return rv;
   }
 }

lib/manager/download.ts

@@ -1,8 +1,9 @@
 "use strict";
 // License: MIT
 
-import { CHROME, downloads } from "../browser";
-import { Prefs } from "../prefs";
+// eslint-disable-next-line no-unused-vars
+import { CHROME, downloads, DownloadOptions } from "../browser";
+import { Prefs, PrefWatcher } from "../prefs";
 import { PromiseSerializer } from "../pserializer";
 import { filterInSitu, parsePath } from "../util";
 import { BaseDownload } from "./basedownload";
@@ -18,22 +19,24 @@ import {
   PAUSABLE,
   PAUSED,
   QUEUED,
-  RUNNING
+  RUNNING,
+  RETRYING
 } from "./state";
 import { Preroller } from "./preroller";
 
-type Header = {name: string; value: string};
-interface Options {
-  conflictAction: string;
-  filename: string;
-  saveAs: boolean;
-  url: string;
-  method?: string;
-  body?: string;
-  incognito?: boolean;
-  headers: Header[];
+function isRecoverable(error: string) {
+  switch (error) {
+  case "SERVER_FAILED":
+    return true;
+
+  default:
+    return error.startsWith("NETWORK_");
+  }
 }
 
+const RETRIES = new PrefWatcher("retries", 5);
+const RETRY_TIME = new PrefWatcher("retry-time", 5);
+
 export class Download extends BaseDownload {
   public manager: Manager;
 
@@ -45,6 +48,10 @@ export class Download extends BaseDownload {
 
   public error: string;
 
+  public dbId: number;
+
+  public deadline: number;
+
   constructor(manager: Manager, options: any) {
     super(options);
     this.manager = manager;
@@ -76,27 +83,28 @@ export class Download extends BaseDownload {
     if (this.manId) {
       const {manId: id} = this;
       try {
-        const state = await downloads.search({id});
-        if (state[0].state === "in_progress") {
+        const state = (await downloads.search({id})).pop() || {};
+        if (state.state === "in_progress" && !state.error && !state.paused) {
           this.changeState(RUNNING);
           this.updateStateFromBrowser();
           return;
         }
-        if (state[0].state === "complete") {
+        if (state.state === "complete") {
           this.changeState(DONE);
           this.updateStateFromBrowser();
           return;
         }
-        if (!state[0].canResume) {
+        if (!state.canResume) {
           throw new Error("Cannot resume");
         }
         // Cannot await here
         // Firefox bug: will not return until download is finished
-        downloads.resume(id).catch(() => {});
+        downloads.resume(id).catch(console.error);
         this.changeState(RUNNING);
         return;
       }
       catch (ex) {
+        console.error("cannot resume", ex);
         this.manager.removeManId(this.manId);
         this.removeFromBrowser();
       }
@@ -120,7 +128,7 @@ export class Download extends BaseDownload {
           return;
         }
       }
-      const options: Options = {
+      const options: DownloadOptions = {
         conflictAction: await Prefs.get("conflict-action"),
         filename: this.dest.full,
         saveAs: false,
@@ -140,6 +148,12 @@ export class Download extends BaseDownload {
           value: this.referrer
         });
       }
+      else if (CHROME) {
+        options.headers.push({
+          name: "X-DTA-ID",
+          value: this.sessionId.toString(),
+        });
+      }
       if (this.manId) {
         this.manager.removeManId(this.manId);
       }
@@ -187,8 +201,7 @@ export class Download extends BaseDownload {
         this.serverName = res.name;
       }
       if (res.error) {
-        this.cancel();
-        this.error = res.error;
+        this.cancelAccordingToError(res.error);
       }
     }
     catch (ex) {
@@ -214,20 +227,32 @@ export class Download extends BaseDownload {
     }
   }
 
-  async pause() {
+  async pause(retry?: boolean) {
     if (!(PAUSABLE & this.state)) {
       return;
     }
+
+    if (!retry) {
+      this.retries = 0;
+      this.deadline = 0;
+    }
+    else {
+      // eslint-disable-next-line no-magic-numbers
+      this.deadline = Date.now() + RETRY_TIME.value * 60 * 1000;
+    }
+
     if (this.state === RUNNING && this.manId) {
       try {
         await downloads.pause(this.manId);
       }
       catch (ex) {
         console.error("pause", ex.toString(), ex);
+        this.cancel();
         return;
       }
     }
-    this.changeState(PAUSED);
+
+    this.changeState(retry ? RETRYING : PAUSED);
   }
 
   reset() {
@@ -235,6 +260,8 @@ export class Download extends BaseDownload {
     this.manId = 0;
     this.written = this.totalSize = 0;
     this.mime = this.serverName = this.browserName = "";
+    this.retries = 0;
+    this.deadline = 0;
   }
 
   async removeFromBrowser() {
@@ -267,6 +294,17 @@ export class Download extends BaseDownload {
     this.changeState(CANCELED);
   }
 
+  async cancelAccordingToError(error: string) {
+    if (!isRecoverable(error) || ++this.retries > RETRIES.value) {
+      this.cancel();
+      this.error = error;
+      return;
+    }
+
+    await this.pause(true);
+    this.error = error;
+  }
+
   setMissing() {
     if (this.manId) {
       this.manager.removeManId(this.manId);
@@ -319,9 +357,11 @@ export class Download extends BaseDownload {
       this.markDirty();
       switch (state.state) {
       case "in_progress":
-        if (error) {
-          this.cancel();
-          this.error = error;
+        if (state.paused) {
+          this.changeState(PAUSED);
+        }
+        else if (error) {
+          this.cancelAccordingToError(error);
         }
         else {
           this.changeState(RUNNING);
@@ -332,6 +372,9 @@ export class Download extends BaseDownload {
         if (state.paused) {
           this.changeState(PAUSED);
         }
+        else if (error) {
+          this.cancelAccordingToError(error);
+        }
         else {
           this.cancel();
           this.error = error || "";

lib/manager/man.ts

@@ -4,11 +4,11 @@
 import { EventEmitter } from "../events";
 import { Notification } from "../notifications";
 import { DB } from "../db";
-import { QUEUED, CANCELED, RUNNING } from "./state";
+import { QUEUED, CANCELED, RUNNING, RETRYING } from "./state";
 // eslint-disable-next-line no-unused-vars
 import { Bus, Port } from "../bus";
 import { sort } from "../sorting";
-import { Prefs } from "../prefs";
+import { Prefs, PrefWatcher } from "../prefs";
 import { _ } from "../i18n";
 import { CoalescedUpdate, mapFilterInSitu, filterInSitu } from "../util";
 import { PromiseSerializer } from "../pserializer";
@@ -16,8 +16,9 @@ import { Download } from "./download";
 import { ManagerPort } from "./port";
 import { Scheduler } from "./scheduler";
 import { Limits } from "./limits";
-import { downloads, runtime } from "../browser";
+import { downloads, runtime, webRequest, CHROME } from "../browser";
 
+const US = runtime.getURL("");
 
 const AUTOSAVE_TIMEOUT = 2000;
 const DIRTY_TIMEOUT = 100;
@@ -29,6 +30,9 @@ const setShelfEnabled = downloads.setShelfEnabled || function() {
   // ignored
 };
 
+const FINISH_NOTIFICATION = new PrefWatcher("finish-notification", true);
+const SOUNDS = new PrefWatcher("sounds", false);
+
 export class Manager extends EventEmitter {
   private items: Download[];
 
@@ -48,10 +52,14 @@ export class Manager extends EventEmitter {
 
   private readonly running: Set<Download>;
 
+  private readonly retrying: Set<Download>;
+
   private scheduler: Scheduler | null;
 
   private shouldReload: boolean;
 
+  private deadlineTimer: number;
+
   constructor() {
     super();
     this.active = true;
@@ -62,11 +70,13 @@ export class Manager extends EventEmitter {
       AUTOSAVE_TIMEOUT, this.save.bind(this));
     this.dirty = new CoalescedUpdate(
       DIRTY_TIMEOUT, this.processDirty.bind(this));
+    this.processDeadlines = this.processDeadlines.bind(this);
     this.sids = new Map();
     this.manIds = new Map();
     this.ports = new Set();
     this.scheduler = null;
     this.running = new Set();
+    this.retrying = new Set();
 
     this.startNext = PromiseSerializer.wrapNew(1, this, this.startNext);
 
@@ -83,6 +93,14 @@ export class Manager extends EventEmitter {
     Limits.on("changed", () => {
       this.resetScheduler();
     });
+
+    if (CHROME) {
+      webRequest.onBeforeSendHeaders.addListener(
+        this.stuffReferrer.bind(this),
+        {urls: ["<all_urls>"]},
+        ["blocking", "requestHeaders", "extraHeaders"]
+      );
+    }
   }
 
   async init() {
@@ -179,14 +197,11 @@ export class Manager extends EventEmitter {
     this.notifiedFinished = false;
   }
 
-  async maybeRunFinishActions() {
-    if (this.running.size) {
-      return;
-    }
-    await this.maybeNotifyFinished();
+  maybeRunFinishActions() {
     if (this.running.size) {
       return;
     }
+    this.maybeNotifyFinished();
     if (this.shouldReload) {
       this.saveQueue.trigger();
       setTimeout(() => {
@@ -199,15 +214,21 @@ export class Manager extends EventEmitter {
     setShelfEnabled(true);
   }
 
-  async maybeNotifyFinished() {
-    if (!(await Prefs.get("finish-notification"))) {
+  maybeNotifyFinished() {
+    if (this.notifiedFinished || this.running.size || this.retrying.size) {
       return;
     }
-    if (this.notifiedFinished || this.running.size) {
-      return;
+    if (SOUNDS.value) {
+      const audio = new Audio(runtime.getURL("/style/done.opus"));
+      audio.addEventListener("canplaythrough", () => audio.play());
+      audio.addEventListener("ended", () => document.body.removeChild(audio));
+      audio.addEventListener("error", () => document.body.removeChild(audio));
+      document.body.appendChild(audio);
+    }
+    if (FINISH_NOTIFICATION.value) {
+      new Notification(null, _("queue-finished"));
     }
     this.notifiedFinished = true;
-    new Notification(null, _("queue-finished"));
   }
 
   addManId(id: number, download: Download) {
@@ -306,6 +327,10 @@ export class Manager extends EventEmitter {
     if (oldState === RUNNING) {
       this.running.delete(download);
     }
+    else if (oldState === RETRYING) {
+      this.retrying.delete(download);
+      this.findDeadline();
+    }
     if (newState === QUEUED) {
       this.resetScheduler();
       this.startNext().catch(console.error);
@@ -317,10 +342,56 @@ export class Manager extends EventEmitter {
       this.running.add(download);
     }
     else {
+      if (newState === RETRYING) {
+        this.addRetry(download);
+      }
       this.startNext().catch(console.error);
     }
   }
 
+  addRetry(download: Download) {
+    this.retrying.add(download);
+    this.findDeadline();
+  }
+
+  private findDeadline() {
+    let deadline = Array.from(this.retrying).
+      reduce<number>((deadline, item) => {
+        if (deadline) {
+          return item.deadline ? Math.min(deadline, item.deadline) : deadline;
+        }
+        return item.deadline;
+      }, 0);
+    if (deadline <= 0) {
+      return;
+    }
+    deadline -= Date.now();
+    if (deadline <= 0) {
+      return;
+    }
+
+    if (this.deadlineTimer) {
+      window.clearTimeout(this.deadlineTimer);
+    }
+    this.deadlineTimer = window.setTimeout(this.processDeadlines, deadline);
+  }
+
+  private processDeadlines() {
+    this.deadlineTimer = 0;
+    try {
+      const now = Date.now();
+      this.items.forEach(item => {
+        if (item.deadline && Math.abs(item.deadline - now) < 1000) {
+          this.retrying.delete(item);
+          item.resume(false);
+        }
+      });
+    }
+    finally {
+      this.findDeadline();
+    }
+  }
+
   sorted(sids: number[]) {
     try {
       // Construct new items
@@ -384,6 +455,31 @@ export class Manager extends EventEmitter {
   getMsgItems() {
     return this.items.map(e => e.toMsg());
   }
+
+  stuffReferrer(details: any): any {
+    if (details.tabId > 0 && !US.startsWith(details.initiator)) {
+      return undefined;
+    }
+    const sidx = details.requestHeaders.findIndex(
+      (e: any) => e.name.toLowerCase() === "x-dta-id");
+    if (sidx < 0) {
+      return undefined;
+    }
+    const sid = parseInt(details.requestHeaders[sidx].value, 10);
+    details.requestHeaders.splice(sidx, 1);
+    const item = this.sids.get(sid);
+    if (!item) {
+      return undefined;
+    }
+    details.requestHeaders.push({
+      name: "Referer",
+      value: (item.uReferrer || item.uURL).toString()
+    });
+    const rv: any = {
+      requestHeaders: details.requestHeaders
+    };
+    return rv;
+  }
 }
 
 let inited: Promise<Manager>;

lib/manager/preroller.ts

@@ -13,6 +13,17 @@ const PREROLL_HEURISTICS = /dl|attach|download|name|file|get|retr|^n$|\.(php|asp
 const PREROLL_HOSTS = /4cdn|chan/;
 const PREROLL_TIMEOUT = 10000;
 const PREROLL_NOPE = new Set<string>();
+
+/* eslint-disable no-magic-numbers */
+const NOPE_STATUSES = Object.freeze(new Set([
+  400,
+  401,
+  402,
+  405,
+  416,
+]));
+/* eslint-enable no-magic-numbers */
+
 const PREROLL_SEARCHEXTS = Object.freeze(new Set<string>([
   "php",
   "asp",
@@ -79,7 +90,7 @@ export class Preroller {
   private async prerollFirefox() {
     const controller = new AbortController();
     const {signal} = controller;
-    const {uURL} = this.download;
+    const {uURL, uReferrer} = this.download;
     const res = await fetch(uURL.toString(), {
       method: "GET",
       headers: new Headers({
@@ -87,6 +98,7 @@ export class Preroller {
       }),
       mode: "same-origin",
       signal,
+      referrer: (uReferrer || uURL).toString(),
     });
     if (res.body) {
       res.body.cancel();
@@ -98,7 +110,7 @@ export class Preroller {
 
   private async prerollChrome() {
     let rid = "";
-    const {uURL} = this.download;
+    const {uURL, uReferrer} = this.download;
     const rurl = uURL.toString();
     let listener: any;
     const wr = new Promise<any[]>(resolve => {
@@ -132,9 +144,11 @@ export class Preroller {
     const res = await fetch(rurl, {
       method: "GET",
       headers: new Headers({
-        Range: "bytes=0-1",
+        "Range": "bytes=0-1",
+        "X-DTA-ID": this.download.sessionId.toString(),
       }),
       signal,
+      referrer: (uReferrer || uURL).toString(),
     });
     if (res.body) {
       res.body.cancel();
@@ -204,7 +218,7 @@ export class Preroller {
     else if (status === 402 || status === 407) {
       rv.error = "SERVER_UNAUTHORIZED";
     }
-    else if (status === 400 || status === 405 || status === 416) {
+    else if (NOPE_STATUSES.has(status)) {
       PREROLL_NOPE.add(this.download.uURL.host);
       if (PREROLL_NOPE.size > 1000) {
         PREROLL_NOPE.delete(PREROLL_NOPE.keys().next().value);

lib/manager/renamer.ts

@@ -193,24 +193,24 @@ export default class Renamer {
   }
 
   toString() {
-    const {mask} = this.d;
+    const {mask, subfolder} = this.d;
     // eslint-disable-next-line @typescript-eslint/no-this-alias
     const self: any = this;
-    // XXX flat
-    return sanitizePath(mask.replace(REPLACE_EXPR, function(type: string) {
+    const baseMask = subfolder ? `${subfolder}/${mask}` : mask;
+    return sanitizePath(baseMask.replace(REPLACE_EXPR, function(type: string) {
       let prop = type.substr(1, type.length - 2);
       const flat = prop.startsWith("flat");
       if (flat) {
         prop = prop.substr(4);
       }
       prop = `p_${prop}`;
-      const rv = (prop in self) ?
+      let rv = (prop in self) ?
         (self[prop] || "").trim() :
         type;
       if (flat) {
-        return rv.replace(/[/\\]+/g, "-");
+        rv = rv.replace(/[/\\]+/g, "-");
       }
-      return rv;
+      return rv.replace(/\/{2,}/g, "/");
     }));
   }
 }

lib/manager/state.ts

@@ -8,8 +8,9 @@ export const PAUSED = 1 << 3;
 export const DONE = 1 << 4;
 export const CANCELED = 1 << 5;
 export const MISSING = 1 << 6;
+export const RETRYING = 1 << 7;
 
-export const RESUMABLE = PAUSED | CANCELED;
-export const FORCABLE = PAUSED | QUEUED | CANCELED;
-export const PAUSABLE = QUEUED | CANCELED | RUNNING;
-export const CANCELABLE = QUEUED | RUNNING | PAUSED | DONE | MISSING;
+export const RESUMABLE = PAUSED | CANCELED | RETRYING;
+export const FORCABLE = PAUSED | QUEUED | CANCELED | RETRYING;
+export const PAUSABLE = QUEUED | CANCELED | RUNNING | RETRYING;
+export const CANCELABLE = QUEUED | RUNNING | PAUSED | DONE | MISSING | RETRYING;

lib/recentlist.ts

@@ -116,3 +116,9 @@ export const FASTFILTER = new RecentList("fastfilter", [
   "*.z??, *.css, *.html"
 ]);
 FASTFILTER.init().catch(console.error);
+
+export const SUBFOLDER = new RecentList("subfolder", [
+  "",
+  "downthemall",
+]);
+SUBFOLDER.init().catch(console.error);

lib/select.ts

@@ -28,7 +28,7 @@ function computeSelection(
     items: BaseMatchedItem[],
     onlyFast: boolean): ItemDelta[] {
   let ws = items.map((item, idx: number) => {
-    item.idx = idx;
+    item.idx = item.idx || idx;
     const {matched = null} = item;
     item.prevMatched = matched;
     item.matched = null;
@@ -187,8 +187,8 @@ export async function select(links: BaseItem[], media: BaseItem[]) {
       openPrefs();
     });
 
-    port.on("openUrls", ({urls}) => {
-      openUrls(urls);
+    port.on("openUrls", ({urls, incognito}) => {
+      openUrls(urls, incognito);
     });
 
     try {

lib/util.ts

@@ -3,6 +3,7 @@
 
 import * as psl from "psl";
 import { identity, memoize } from "./memoize";
+import { IPReg } from "./ipreg";
 export { debounce } from "../uikit/lib/util";
 
 export class Promised {
@@ -237,7 +238,10 @@ export interface URLd extends URL {
 Object.defineProperty(URL.prototype, "domain", {
   get() {
     try {
-      return hostToDomain(this.host) || this.host;
+      const {hostname} = this;
+      return IPReg.test(hostname) ?
+        hostname :
+        hostToDomain(hostname) || hostname;
     }
     catch (ex) {
       console.error(ex);
@@ -357,3 +361,20 @@ export function mapFilterInSitu<TRes, T>(
 export function randint(min: number, max: number) {
   return Math.floor(Math.random() * (max - min)) + min;
 }
+
+
+export function validateSubFolder(folder: string) {
+  if (!folder) {
+    return;
+  }
+  folder = folder.replace(/[/\\]+/g, "/");
+  if (folder.startsWith("/")) {
+    throw new Error("error.noabsolutepath");
+  }
+  if (/^[a-z]:\//i.test(folder)) {
+    throw new Error("error.noabsolutepath");
+  }
+  if (/^\.+\/|\/\.+\/|\/\.+$/g.test(folder)) {
+    throw new Error("error.nodotsinpath");
+  }
+}

lib/windowstatetracker.ts

@@ -55,13 +55,15 @@ export class WindowStateTracker {
 
   getOptions(options: any) {
     const result = Object.assign(options, {
-      width: this.width,
-      height: this.height,
       state: this.state,
     });
-    if (this.top >= 0) {
-      result.top = this.top;
-      result.left = this.left;
+    if (result.state !== "maximized") {
+      result.width = this.width;
+      result.height = this.height;
+      if (this.top >= 0) {
+        result.top = this.top;
+        result.left = this.left;
+      }
     }
     return result;
   }

lib/windowutils.ts

@@ -2,43 +2,56 @@
 // License: MIT
 
 import { windows, tabs, runtime } from "../lib/browser";
-import {getManager} from "./manager/man";
+import { getManager } from "./manager/man";
 import DEFAULT_ICONS from "../data/icons.json";
+import { Prefs } from "./prefs";
+import { _ } from "./i18n";
 
 const DONATE_URL = "https://www.downthemall.org/howto/donate/";
+const DONATE_LANG_URLS = Object.freeze(new Map([
+  ["de", "https://www.downthemall.org/howto/donate/spenden/"],
+]));
 const MANAGER_URL = "/windows/manager.html";
 
-export async function mostRecentBrowser(): Promise<any> {
+export async function mostRecentBrowser(incognito: boolean): Promise<any> {
   let window;
   try {
-    window = await windows.getCurrent({windowTypes: ["normal"]});
+    window = await windows.getCurrent();
     if (window.type !== "normal") {
       throw new Error("not a normal window");
     }
+    if (incognito && !window.incognito) {
+      throw new Error("Not incognito");
+    }
   }
   catch {
     try {
-      window = await windows.getlastFocused({windowTypes: ["normal"]});
+      window = await windows.getlastFocused();
       if (window.type !== "normal") {
         throw new Error("not a normal window");
       }
+      if (incognito && !window.incognito) {
+        throw new Error("Not incognito");
+      }
     }
     catch {
       window = Array.from(await windows.getAll({windowTypes: ["normal"]})).
-        filter((w: any) => w.type === "normal").pop();
+        filter(
+          (w: any) => w.type === "normal" && !!w.incognito === !!incognito).
+        pop();
     }
   }
   if (!window) {
     window = await windows.create({
-      url: DONATE_URL,
+      incognito: !!incognito,
       type: "normal",
     });
   }
   return window;
 }
 
-export async function openInTab(url: string) {
-  const window = await mostRecentBrowser();
+export async function openInTab(url: string, incognito: boolean) {
+  const window = await mostRecentBrowser(incognito);
   await tabs.create({
     active: true,
     url,
@@ -47,7 +60,7 @@ export async function openInTab(url: string) {
   await windows.update(window.id, {focused: true});
 }
 
-export async function openInTabOrFocus(url: string) {
+export async function openInTabOrFocus(url: string, incognito: boolean) {
   const etabs = await tabs.query({
     url
   });
@@ -57,21 +70,22 @@ export async function openInTabOrFocus(url: string) {
     await windows.update(tab.windowId, {focused: true});
     return;
   }
-  await openInTab(url);
+  await openInTab(url, incognito);
 }
 
-export async function maybeOpenInTab(url: string) {
+export async function maybeOpenInTab(url: string, incognito: boolean) {
   const etabs = await tabs.query({
     url
   });
   if (etabs.length) {
     return;
   }
-  await openInTab(url);
+  await openInTab(url, incognito);
 }
 
 export async function donate() {
-  await openInTab(DONATE_URL);
+  const url = DONATE_LANG_URLS.get(_("language_code")) || DONATE_URL;
+  await openInTab(url, false);
 }
 
 export async function openPrefs() {
@@ -85,16 +99,38 @@ export async function openManager(focus = true) {
   catch (ex) {
     console.error(ex.toString(), ex);
   }
+  const url = runtime.getURL(MANAGER_URL);
+  const openInPopup = await Prefs.get("manager-in-popup");
+  if (openInPopup) {
+    const etabs = await tabs.query({
+      url
+    });
+    if (etabs.length) {
+      if (!focus) {
+        return;
+      }
+      const tab = etabs.pop();
+      await tabs.update(tab.id, {active: true});
+      await windows.update(tab.windowId, {focused: true});
+      return;
+    }
+    const windowOptions = {
+      url,
+      type: "popup",
+    };
+    await windows.create(windowOptions);
+    return;
+  }
   if (focus) {
-    await openInTabOrFocus(await runtime.getURL(MANAGER_URL));
+    await openInTabOrFocus(runtime.getURL(MANAGER_URL), false);
   }
   else {
-    await maybeOpenInTab(await runtime.getURL(MANAGER_URL));
+    await maybeOpenInTab(runtime.getURL(MANAGER_URL), false);
   }
 }
 
-export async function openUrls(urls: string) {
-  const window = await mostRecentBrowser();
+export async function openUrls(urls: string, incognito: boolean) {
+  const window = await mostRecentBrowser(incognito);
   for (const url of urls) {
     try {
       await tabs.create({

manifest.json

@@ -1,7 +1,7 @@
 {
   "manifest_version": 2,
   "name": "DownThemAll!",
-  "version": "4.0.10",
+  "version": "4.1.2",
 
   "description": "__MSG_extensionDescription__",
   "homepage_url": "https://downthemall.org/",
@@ -34,7 +34,8 @@
     "storage",
     "tabs",
     "webNavigation",
-    "webRequest"
+    "webRequest",
+    "webRequestBlocking"
   ],
 
   "background": {

scripts/gather.ts

@@ -77,6 +77,8 @@ function urlToUsable(e: any, u: string) {
 }
 
 class Gatherer {
+  private: boolean;
+
   textLinks: boolean;
 
   selectionOnly: boolean;
@@ -88,6 +90,7 @@ class Gatherer {
   transferable: string[];
 
   constructor(options: any) {
+    this.private = !!options.private;
     this.textLinks = options.textLinks;
     this.selectionOnly = options.selectionOnly;
     this.selection = options.selectionOnly ? getSelection() : null;
@@ -255,6 +258,7 @@ class Gatherer {
       return {
         url: url.href,
         title,
+        private: this.private
       };
     }
     catch (ex) {

style/common.css

@@ -10,6 +10,7 @@
   --add-color: navy;
   --queue-color: gray;
   --pause-color: #ffa318;
+  --retry-color: rgb(0, 112, 204);
   --error-color: rgb(160, 13, 42);
   --running-color: #aae061;
   --finishing-color: #57cc12;
@@ -93,6 +94,7 @@ html, body {
 .icon-file-video:before { content: '\e825'; } /* '' */
 .icon-file-generic:before { content: '\e826'; } /* '' */
 .icon-question-dark:before { content: '\e827'; } /* '' */
+.icon-forward:before { content: '\e828'; } /* '' */
 .icon-filter:before { content: '\f0b0'; } /* '' */
 .icon-donate:before { content: '\f0d6'; } /* '' */
 .icon-file-doc:before { content: '\f0f6'; } /* '' */
@@ -105,7 +107,8 @@ html, body {
 .icon-file-image:before { content: '\f1c5'; } /* '' */
 .icon-file-archive:before { content: '\f1c6'; } /* '' */
 .icon-file-audio:before { content: '\f1c7'; } /* '' */
-.icon-toggle:before { content: '\f205'; } /* '' */
+.icon-toggle-off:before { content: '\f204'; } /* '' */
+.icon-toggle-on:before { content: '\f205'; } /* '' */
 .icon-server:before { content: '\f233'; } /* '' */
 .icon-question-light:before { content: '\f29c'; } /* '' */
 

style/manager.css

@@ -202,6 +202,23 @@ body > * {
   );
 }
 
+.retrying .virtualtable-column-2 .virtualtable-icon {
+  color: var(--retry-color);
+}
+.retrying .virtualtable-column-2 .virtualtable-progress-bar {
+  background: var(--retry-color);
+}
+.retrying .virtualtable-column-2 .virtualtable-progress-undetermined {
+  background: repeating-linear-gradient(
+    45deg,
+    var(--retry-color),
+    var(--retry-color) 6px,
+    transparent 6px,
+    transparent 12px
+  );
+}
+
+
 .missing .virtualtable-column-2 .virtualtable-icon,
 .canceled .virtualtable-column-2 .virtualtable-icon {
   color: var(--error-color);
@@ -327,6 +344,7 @@ body > * {
   height: 16px;
   -moz-appearance: none;
   border: 0;
+  outline: 0;
   background: transparent;
   width: calc(100% - 28px);
 }
@@ -511,4 +529,24 @@ body > * {
   height: 100%;
   width: 100%;
   background: var(--done-color);
+}
+
+#tooltip-eta.single {
+  font-weight: bold;
+  grid-column-end: span 2;
+}
+
+.deletefiles-list {
+  padding-left: 1ex;
+  padding-right: 1.5ex;
+  border: 1px solid lightgray;
+  border-radius: 6px;
+  background-color: rgba(128,128,128,0.1);
+  max-height: 8em;
+  overflow-y: auto;
+}
+.deletefiles-list > li {
+  list-style-type: none;
+  padding: 0;
+  margin: 0;
 }

style/prefs.css

@@ -138,4 +138,11 @@ legend {
   border-radius: 6px;
   background: rgba(128, 128, 128, 0.05);
   box-shadow: 1px 1px 6px lightgray;
+}
+
+#network-general {
+  display: grid;
+  grid-template-columns: auto 1fr;
+  grid-column-gap: 1em;
+  grid-row-gap: 1ex;
 }

style/single.css

@@ -63,6 +63,7 @@ p.example {
   align-items: center;
 }
 
+#options > #subfolderOptions,
 #options > #maskOptions {
   display: grid;
   grid-template-columns: 2fr auto auto;

tests/test_urld.js

@@ -0,0 +1,43 @@
+/* eslint-env node */
+/* eslint-disable @typescript-eslint/no-var-requires */
+"use strict";
+// License: CC0 1.0
+
+require("../lib/util");
+
+describe("URLd", function() {
+  it("basic domain", function() {
+    let u = new URL("https://www.google.de");
+    expect(u.domain).to.equal("google.de");
+    u = new URL("https://www.google.de:8443");
+    expect(u.domain).to.equal("google.de");
+  });
+
+  it("plain basic domain", function() {
+    const u = new URL("https://google.de");
+    expect(u.domain).to.equal("google.de");
+  });
+
+  it("special domain", function() {
+    let u = new URL("https://www.google.co.uk");
+    expect(u.domain).to.equal("google.co.uk");
+    u = new URL("https://google.co.uk");
+    expect(u.domain).to.equal("google.co.uk");
+    u = new URL("https://www.google.co.uk:8443");
+    expect(u.domain).to.equal("google.co.uk");
+  });
+
+  it("ipv4", function() {
+    let u = new URL("https://127.0.0.1:8443");
+    expect(u.domain).to.equal("127.0.0.1");
+    u = new URL("https://0.0.0.0:8443");
+    expect(u.domain).to.equal("0.0.0.0");
+  });
+
+  it("ipv6", function() {
+    let u = new URL("https://[::1]:8443");
+    expect(u.domain).to.equal("[::1]");
+    u = new URL("https://[2a00:1450:4005:800::2003]:8443");
+    expect(u.domain).to.equal("[2a00:1450:4005:800::2003]");
+  });
+});

util/addlocale.py

@@ -70,7 +70,7 @@ def main():
         if modified:
             try:
                 with open("messages.json.tmp", "w", encoding="utf-8") as outp:
-                    json.dump(data, outp, sort_keys=True, indent=2)
+                    json.dump(data, outp, sort_keys=True, indent=2, ensure_ascii=False)
                 os.rename("messages.json.tmp", "_locales/en/messages.json")
             finally:
                 try:

util/build.py

@@ -26,7 +26,7 @@ UNCOMPRESSABLE = set((".png", ".jpg", ".zip", ".woff2"))
 LICENSED = set((".css", ".html", ".js", "*.ts"))
 IGNORED = set((".DS_Store", "Thumbs.db"))
 
-PERM_IGNORED_FX = set(("downloads.shelf", "webRequest"))
+PERM_IGNORED_FX = set(("downloads.shelf", "webRequest", "webRequestBlocking"))
 PERM_IGNORED_CHROME = set(("menus", "sessions"))
 
 SCRIPTS = [

windows/dropdown.ts

@@ -22,6 +22,9 @@ export class Dropdown extends EventEmitter {
 
     this.container = document.createElement("div");
     this.container.classList.add("dropdown");
+    if (input.id) {
+      this.container.id = `${input.id}-dropdown`;
+    }
 
     input = input.parentElement.replaceChild(this.container, input);
     this.input = input as HTMLInputElement;

windows/manager.html

@@ -75,6 +75,7 @@
     <ul id="table-context" class="table-context">
       <li id="ctx-open-file" data-key="Enter" data-i18n="open-file" data-icon="icon-file">Open File</li>
       <li id="ctx-open-directory" data-key="ACCEL-Enter" data-i18n="open-directory" data-icon="icon-folder">Open Directory</li>
+      <li id="ctx-delete-files" data-key="ACCEL-Delete" data-i18n="deletefiles" data-icon="icon-delete"></li>
       <li>-</li>
       <li id="ctx-resume" data-key="ACCEL-KeyR" data-i18n="resume-download" data-icon="icon-go">Resume</li>
       <li id="ctx-pause" data-key="ACCEL-KeyP" data-i18n="pause-download" data-icon="icon-pause">Pause</li>
@@ -109,6 +110,15 @@
       <li id="ctx-select-all" data-key="ACCEL-KeyA" data-i18n="select-all">Select All</li>
       <li id="ctx-select-invert" data-key="ACCEL-KeyI" data-i18n="invert-selection">Invert Selection</li>
       <li>-</li>
+      <li id="ctx-import" data-icon="icon-import" data-i18n="import"></li>
+      <li id="ctx-export" data-icon="icon-download" data-i18n="export">
+        <ul class="table-context">
+          <li id="ctx-export-text" data-i18n="export-text"></li>
+          <li id="ctx-export-aria2" data-i18n="export-aria2"></li>
+          <li id="ctx-export-metalink" data-i18n="export-metalink"></li>
+        </ul>
+      </li>
+      <li>-</li>
       <li id="ctx-move-top" data-key="ALT-Home" data-i18n="move-top" data-icon="icon-top">Top</li>
       <li id="ctx-move-up" data-key="ALT-PageUp" data-i18n="move-up" data-icon="icon-up">Up</li>
       <li id="ctx-move-down" data-key="ALT-PageDown" data-i18n="move-down" data-icon="icon-down">down</li>
@@ -125,6 +135,12 @@
     </p>
   </template>
 
+  <template id="deletefiles-template">
+    <h1 class="deletefiles-title" data-i18n="deletefiles_title"></h1>
+    <p class="deletefiles-text" data-i18n="deletefiles_text"></p>
+    <ul class="deletefiles-list"></ul>
+  </template>
+
   <template id="menufilter-template">
     <ul>
       <li id="ctx-menufilter-seperator">-</li>

windows/manager.ts

@@ -8,6 +8,7 @@ import PORT from "./manager/port";
 import { runtime } from "../lib/browser";
 import { Promised } from "../lib/util";
 import { PromiseSerializer } from "../lib/pserializer";
+import { Keys } from "./keys";
 
 const $ = document.querySelector.bind(document);
 
@@ -120,6 +121,11 @@ addEventListener("DOMContentLoaded", function dom() {
       statusNetwork.setAttribute("title", _("statusNetwork-inactive.title"));
     }
   });
+
+  Keys.on("ACCEL-KeyF", () => {
+    $("#filter").focus();
+    return true;
+  });
 });
 
 addEventListener("contextmenu", event => {

windows/manager/removaldlg.ts

@@ -7,7 +7,7 @@ import { Prefs } from "../../lib/prefs";
 import { Keys } from "../keys";
 import { $ } from "../winutil";
 
-export default class RemovalModalDialog extends ModalDialog {
+export class RemovalModalDialog extends ModalDialog {
   private readonly text: string;
 
   private readonly pref: string;
@@ -68,3 +68,57 @@ export default class RemovalModalDialog extends ModalDialog {
     this.focusDefault();
   }
 }
+
+export class DeleteFilesDialog extends ModalDialog {
+  private readonly paths: string[];
+
+  constructor(paths: string[]) {
+    super();
+    this.paths = paths;
+  }
+
+  async getContent() {
+    const content = $<HTMLTemplateElement>("#deletefiles-template").
+      content.cloneNode(true) as DocumentFragment;
+    await localize(content);
+    const list = $(".deletefiles-list", content);
+    for (const path of this.paths) {
+      const li = document.createElement("li");
+      li.textContent = path;
+      list.appendChild(li);
+    }
+    return content;
+  }
+
+  get buttons() {
+    return [
+      {
+        title: _("deletefiles_button"),
+        value: "ok",
+        default: true,
+        dismiss: false,
+      },
+      {
+        title: _("cancel"),
+        value: "cancel",
+        default: false,
+        dismiss: true,
+      }
+    ];
+  }
+
+  async show() {
+    Keys.suppressed = true;
+    try {
+      return await super.show();
+    }
+    finally {
+      Keys.suppressed = false;
+    }
+  }
+
+  shown() {
+    this.focusDefault();
+  }
+}
+

windows/manager/state.ts

@@ -10,6 +10,7 @@ export const StateTexts = locale.then(() => Object.freeze(new Map([
   [DownloadState.QUEUED, _("queued")],
   [DownloadState.RUNNING, _("running")],
   [DownloadState.FINISHING, _("finishing")],
+  [DownloadState.RETRYING, _("paused")],
   [DownloadState.PAUSED, _("paused")],
   [DownloadState.DONE, _("done")],
   [DownloadState.CANCELED, _("canceled")],
@@ -21,6 +22,7 @@ export const StateClasses = Object.freeze(new Map([
   [DownloadState.RUNNING, "running"],
   [DownloadState.FINISHING, "finishing"],
   [DownloadState.PAUSED, "paused"],
+  [DownloadState.RETRYING, "retrying"],
   [DownloadState.DONE, "done"],
   [DownloadState.CANCELED, "canceled"],
   [DownloadState.MISSING, "missing"],
@@ -31,6 +33,7 @@ export const StateIcons = Object.freeze(new Map([
   [DownloadState.RUNNING, "icon-go"],
   [DownloadState.FINISHING, "icon-go"],
   [DownloadState.PAUSED, "icon-pause"],
+  [DownloadState.RETRYING, "icon-pause"],
   [DownloadState.DONE, "icon-done"],
   [DownloadState.CANCELED, "icon-error"],
   [DownloadState.MISSING, "icon-failed"],

windows/manager/table.ts

@@ -26,7 +26,7 @@ import {
   MenuFilter
 } from "./itemfilters";
 import { FilteredCollection } from "./itemfilters";
-import RemovalModalDialog from "./removaldlg";
+import { RemovalModalDialog, DeleteFilesDialog } from "./removaldlg";
 import { Stats } from "./stats";
 import PORT from "./port";
 import { DownloadState, StateTexts, StateClasses, StateIcons } from "./state";
@@ -38,6 +38,10 @@ import { $ } from "../winutil";
 // eslint-disable-next-line no-unused-vars
 import { TableConfig } from "../../uikit/lib/config";
 import { IconCache } from "../../lib/iconcache";
+import * as imex from "../../lib/imex";
+// eslint-disable-next-line no-unused-vars
+import { BaseItem } from "../../lib/item";
+import { API } from "../../lib/api";
 
 const TREE_CONFIG_VERSION = 2;
 const RUNNING_TIMEOUT = 1000;
@@ -146,6 +150,8 @@ export class DownloadItem extends EventEmitter {
 
   public opening: boolean;
 
+  public retries: number;
+
   constructor(owner: DownloadTable, raw: any, stats?: Stats) {
     super();
     Object.assign(this, raw);
@@ -247,6 +253,12 @@ export class DownloadItem extends EventEmitter {
     if (this.state === DownloadState.RUNNING) {
       return this.eta;
     }
+    if (this.state === DownloadState.RETRYING) {
+      if (this.error) {
+        return _("retrying_error", _(this.error) || this.error);
+      }
+      return _("retrying");
+    }
     if (this.error) {
       return _(this.error) || this.error;
     }
@@ -404,6 +416,8 @@ export class DownloadTable extends VirtualTable {
 
   private readonly openDirectoryAction: Broadcaster;
 
+  private readonly deleteFilesAction: Broadcaster;
+
   private readonly moveTopAction: Broadcaster;
 
   private readonly moveUpAction: Broadcaster;
@@ -546,6 +560,12 @@ export class DownloadTable extends VirtualTable {
     ctx.on("ctx-remove-paused", () => this.removePausedDownloads());
     ctx.on("ctx-remove-batch", () => this.removeBatchDownloads());
 
+    ctx.on("ctx-import", () => this.importDownloads());
+    ctx.on("ctx-export-text", () => this.exportDownloads(imex.textExporter));
+    ctx.on("ctx-export-aria2", () => this.exportDownloads(imex.aria2Exporter));
+    ctx.on("ctx-export-metalink",
+      () => this.exportDownloads(imex.metalinkExporter));
+
     ctx.on("dismissed", () => this.table.focus());
 
     this.on("contextmenu", (tree, event) => {
@@ -579,6 +599,9 @@ export class DownloadTable extends VirtualTable {
     this.openDirectoryAction = new Broadcaster("ctx-open-directory");
     this.openDirectoryAction.onaction = this.openDirectory.bind(this);
 
+    this.deleteFilesAction = new Broadcaster("ctx-delete-files");
+    this.deleteFilesAction.onaction = this.deleteFiles.bind(this);
+
     const moveAction = (method: string) => {
       if (this.selection.empty) {
         return;
@@ -610,6 +633,7 @@ export class DownloadTable extends VirtualTable {
       this.moveBottomAction,
       this.openFileAction,
       this.openDirectoryAction,
+      this.deleteFilesAction,
     ]);
 
     this.on(
@@ -782,6 +806,10 @@ export class DownloadTable extends VirtualTable {
       this.cancelAction.disabled = true;
     }
 
+    if (!(states & DownloadState.DONE)) {
+      this.deleteFilesAction.disabled = true;
+    }
+
     const item = this.focusRow >= 0 ?
       this.downloads.filtered[this.focusRow] :
       null;
@@ -860,6 +888,33 @@ export class DownloadTable extends VirtualTable {
     }
   }
 
+  async deleteFiles() {
+    const items = [];
+    for (const rowid of this.selection) {
+      const item = this.downloads.filtered[rowid];
+      if (item.state === DownloadState.DONE && item.manId) {
+        items.push(item);
+      }
+    }
+    if (!items.length) {
+      return;
+    }
+    const sids = items.map(i => i.sessionId);
+    const paths = items.map(i => i.destFull);
+    await new DeleteFilesDialog(paths).show();
+    await Promise.all(items.map(async item => {
+      try {
+        if (item.manId && item.state === DownloadState.DONE) {
+          await downloads.removeFile(item.manId);
+        }
+      }
+      catch {
+        // ignored
+      }
+    }));
+    this.removeDownloadsInternal(sids);
+  }
+
   removeDownloadsInternal(sids?: number[]) {
     if (!sids) {
       sids = [];
@@ -1132,6 +1187,49 @@ export class DownloadTable extends VirtualTable {
     this.selection.toggle(0, this.rowCount - 1);
   }
 
+  importDownloads() {
+    const picker = document.createElement("input");
+    picker.setAttribute("type", "file");
+    picker.setAttribute("accept", "text/*,.txt,.lst,.metalink,.meta4");
+    picker.onchange = () => {
+      if (!picker.files || !picker.files.length) {
+        return;
+      }
+      const reader = new FileReader();
+      reader.onload = () => {
+        if (!reader.result) {
+          return;
+        }
+        const items = imex.importText(reader.result as string);
+        if (!items || !items.length) {
+          return;
+        }
+        API.regular(items, []);
+      };
+      reader.readAsText(picker.files[0], "utf-8");
+    };
+    picker.click();
+  }
+
+  exportDownloads(exporter: imex.Exporter) {
+    const items = this.getSelectedItems();
+    if (!items.length) {
+      return;
+    }
+    const text = exporter.getText(items as unknown as BaseItem[]);
+    const enc = new TextEncoder();
+    const data = enc.encode(text);
+    const url = URL.createObjectURL(new Blob([data], {type: "text/plain"}));
+    const link = document.createElement("a");
+    link.setAttribute("href", url);
+    link.setAttribute("download", exporter.fileName);
+    link.style.display = "none";
+    document.body.appendChild(link);
+    link.click();
+    document.body.removeChild(link);
+    URL.revokeObjectURL(url);
+  }
+
   getRowClasses(rowid: number) {
     const item = this.downloads.filtered[rowid];
     if (!item) {

windows/manager/tooltip.ts

@@ -192,7 +192,7 @@ export class Tooltip {
     const hidden = this.speedbox.classList.contains("hidden");
 
     if (!running && !hidden) {
-      this.eta.style.fontWeight = "bold";
+      this.eta.classList.add("single");
       this.etalabel.classList.add("hidden");
       this.speedbox.classList.add("hidden");
       this.progressbar.classList.add("hidden");
@@ -202,7 +202,7 @@ export class Tooltip {
       return;
     }
     if (hidden) {
-      this.eta.style.fontWeight = "auto";
+      this.eta.classList.remove("single");
       this.etalabel.classList.remove("hidden");
       this.speedbox.classList.remove("hidden");
       this.progressbar.classList.remove("hidden");

windows/prefs.html

@@ -43,8 +43,17 @@
   <article id="tab-general" class="tab">
     <fieldset>
       <legend data-i18n="pref.ui">UI</legend>
-      <label><input type="checkbox" id="pref-global-turbo"> <span data-i18n="pref-global-turbo">Global turbo</span></label>
+      <div id="pref-button-type">
+        <label data-i18n="pref-button-type"></label>
+        <label><input type="radio" name="pref-button-type" value="popup"> <span data-i18n="pref-button-type-popup"></span></label>
+        <label><input type="radio" name="pref-button-type" value="dta"> <span data-i18n="pref-button-type-dta"></span></label>
+        <label><input type="radio" name="pref-button-type" value="turbo"> <span data-i18n="pref-button-type-turbo"></span></label>
+        <label><input type="radio" name="pref-button-type" value="manager"> <span data-i18n="pref-button-type-manager"></span></label>
+      </div>
+      <hr>
+      <label><input type="checkbox" id="pref-manager-in-popup"> <span data-i18n="pref-manager-in-popup"></span></label>
       <label><input type="checkbox" id="pref-finish-notification"> <span data-i18n="pref-finish-notification"></span></label>
+      <label><input type="checkbox" id="pref-sounds"> <span data-i18n="pref-sounds"></span></label>
       <label><input type="checkbox" id="pref-hide-context"> <span data-i18n="pref-hide-context"></span></label>
       <div style="margin-top: 1em;">
         <button id="reset-confirmations" data-i18n="reset-confirmations"></button>
@@ -114,9 +123,14 @@
   </article>
 
   <article id="tab-network" class="tab">
-    <fieldset>
+    <fieldset id="network-general">
       <legend data-i18n="pref.netglobal"></legend>
-      <label><span data-i18n="pref-concurrent-downloads">Concurrent downloads</span> <input id="pref-concurrent-downloads" type="number" min="1" max="10"></label>
+      <label data-i18n="pref-concurrent-downloads">Concurrent downloads</label>
+      <input id="pref-concurrent-downloads" type="number" min="1" max="10">
+      <label data-i18n="pref-retries"></label>
+      <input id="pref-retries" type="number" min="0" max="100">
+      <label data-i18n="pref-retry-time"></label>
+      <input id="pref-retry-time" type="number" min="1" max="600">
     </fieldset>
     <table id="limits" data-singleselect="true">
       <tr>

windows/prefs.ts

@@ -554,9 +554,10 @@ addEventListener("DOMContentLoaded", async () => {
   await localize(document.documentElement);
 
   // General
-  new BoolPref("pref-global-turbo", "global-turbo");
+  new BoolPref("pref-manager-in-popup", "manager-in-popup");
   new BoolPref("pref-queue-notification", "queue-notification");
   new BoolPref("pref-finish-notification", "finish-notification");
+  new BoolPref("pref-sounds", "sounds");
   new BoolPref("pref-hide-context", "hide-context");
   new BoolPref("pref-tooltip", "tooltip");
   new BoolPref("pref-open-manager-on-queue", "open-manager-on-queue");
@@ -564,6 +565,7 @@ addEventListener("DOMContentLoaded", async () => {
   new BoolPref("pref-add-paused", "add-paused");
   new BoolPref("pref-show-urls", "show-urls");
   new BoolPref("pref-remove-missing-on-init", "remove-missing-on-init");
+  new OptionPref("pref-button-type", "button-type");
   new OptionPref("pref-conflict-action", "conflict-action");
 
   $("#reset-confirmations").addEventListener("click", async () => {
@@ -621,6 +623,8 @@ addEventListener("DOMContentLoaded", async () => {
 
   // Network
   new IntPref("pref-concurrent-downloads", "concurrent");
+  new IntPref("pref-retries", "retries");
+  new IntPref("pref-retry-time", "retry-time");
 
   visible("#limits").then(() => new LimitsUI());
 

windows/select.html

@@ -39,7 +39,7 @@
         <th id="colTitle" data-i18n="title">Title</th>
         <th id="colDescription" data-i18n="description">Description</th>
         <th id="colMask" data-i18n="mask">Mask</th>
-        <!--<th id="colReferrer" data-i18n="referrer">Referrer</th>-->
+        <th id="colReferrer" data-i18n="referrer">Referrer</th>
       </tr>
     </table>
   </div>
@@ -59,6 +59,15 @@
       <input type="checkbox" id="fastOnceCheck">
       <span data-i18n="useonlyonce">Use only once</span>
     </label>
+
+    <h2 data-i18n="subfolder"></h2>
+    <input id="subfolder" data-i18n="placeholder=subfolder.placeholder">
+    <span></span>
+    <label>
+      <input type="checkbox" id="subfolderOnceCheck">
+      <span data-i18n="useonlyonce">Use only once</span>
+    </label>
+
     <h2 data-i18n="mask">Mask</h2>
     <input id="mask">
     <button id="maskButton" class="icon-tags"></button>
@@ -84,6 +93,7 @@
       <li id="ctx-toggle-selected" data-icon="icon-unchecked" data-i18n="toggle-selected-items">Toggle Check for Selected Items</li>
       <li>-</li>
       <li id="ctx-mask" data-icon="icon-tags" data-i18n="set-mask">Mask</li>
+      <li id="ctx-referrer" data-icon="icon-forward" data-i18n="set-referrer">Referrer</li>
       <li>-</li>
       <li id="ctx-select-all" data-key="ACCEL-KeyA" data-i18n="select-all">Select All</li>
       <li id="ctx-select-filtered" data-key="ACCEL-KeyF" data-i18n="select-checked">Select Checked</li>

windows/select.ts

@@ -7,7 +7,7 @@ import { ContextMenu } from "./contextmenu";
 import { iconForPath } from "../lib/windowutils";
 import { _, localize } from "../lib/i18n";
 import { Prefs } from "../lib/prefs";
-import { MASK, FASTFILTER } from "../lib/recentlist";
+import { MASK, FASTFILTER, SUBFOLDER } from "../lib/recentlist";
 import { WindowState } from "./windowstate";
 import { Dropdown } from "./dropdown";
 import { Keys } from "./keys";
@@ -24,6 +24,7 @@ import { BaseItem } from "../lib/item";
 import { ItemDelta } from "../lib/select";
 // eslint-disable-next-line no-unused-vars
 import { TableConfig } from "../uikit/lib/config";
+import { validateSubFolder as validateSubfolder } from "../lib/util";
 
 const PORT: RawPort = runtime.connect(null, { name: "select" });
 
@@ -42,6 +43,7 @@ const NUM_FILTER_CLASSES = 8;
 let Table: SelectionTable;
 let Mask: Dropdown;
 let FastFilter: Dropdown;
+let Subfolder: Dropdown;
 
 
 type DELTAS = {deltaLinks: ItemDelta[]; deltaMedia: ItemDelta[]};
@@ -51,7 +53,7 @@ interface BaseMatchedItem extends BaseItem {
   rowid: number;
 }
 
-function cleaErrors() {
+function clearErrors() {
   const not = $("#notification");
   not.textContent = "";
   not.style.display = "none";
@@ -117,7 +119,9 @@ class CheckClasser extends Map<string, string> {
     let result = super.get(key);
     if (typeof result !== "string") {
       result = this.gen.next().value;
-      super.set(key, result);
+      if (result) {
+        super.set(key, result);
+      }
     }
     return result;
   }
@@ -352,7 +356,7 @@ class SelectionTable extends VirtualTable {
       try {
         Keys.suppressed = true;
         const newmask = await ModalDialog.prompt(
-          "Renaming mask", "Set new renaming mask", oldmask);
+          _("set_mask"), _("set_mask_text"), oldmask);
         for (const r of this.selection) {
           this.items.at(r).mask = newmask;
           this.invalidateRow(r);
@@ -366,6 +370,57 @@ class SelectionTable extends VirtualTable {
       }
     });
 
+    this.contextMenu.on("ctx-referrer", async() => {
+      if (this.selection.empty) {
+        return;
+      }
+      let oldref = "";
+      for (const r of this.selection) {
+        const m = this.items.at(r).usableReferrer;
+        if (oldref && m !== oldref) {
+          oldref = "";
+          break;
+        }
+        oldref = m || oldref;
+      }
+      try {
+        Keys.suppressed = true;
+        const newref = await ModalDialog.prompt(
+          _("set_referrer"), _("set_referrer_text"), oldref);
+        try {
+          let ref;
+          if (!newref) {
+            ref = {
+              referrer: undefined,
+              usableReferrer: undefined,
+            };
+          }
+          else {
+            const u = new URL(newref);
+            u.hash = "";
+            ref = {
+              referrer: u.toString(),
+              usableReferrer: decodeURIComponent(u.toString()),
+            };
+          }
+          for (const r of this.selection) {
+            Object.assign(this.items.at(r), ref);
+            this.invalidateRow(r);
+          }
+        }
+        catch {
+          // ignored
+        }
+      }
+      catch (ex) {
+        console.warn("mask dismissed", ex);
+      }
+      finally {
+        Keys.suppressed = false;
+      }
+    });
+
+
     this.contextMenu.on("dismissed", () => this.table.focus());
 
     this.on("contextmenu", (tree, event) => {
@@ -428,17 +483,42 @@ class SelectionTable extends VirtualTable {
   }
 
   openSelection() {
-    const items = this.items.filter((i, idx) => this.selection.contains(idx));
-    if (!items.length) {
+    const privates: BaseMatchedItem[] = [];
+    const items = this.items.filter((i, idx) => this.selection.contains(idx)).
+      filter(i => {
+        if (i.private) {
+          privates.push(i);
+          return false;
+        }
+        return true;
+      });
+    if (!items.length && !privates.length) {
       if (this.focusRow < 0) {
         return;
       }
-      items.push(this.items.at(this.focusRow));
+      const item = this.items.at(this.focusRow);
+      if (item.private) {
+        privates.push(item);
+      }
+      else {
+        items.push(item);
+      }
+    }
+
+    if (items.length) {
+      PORT.postMessage({
+        msg: "openUrls",
+        urls: items.map(e => e.url),
+        incognito: false,
+      });
+    }
+    if (privates.length) {
+      PORT.postMessage({
+        msg: "openUrls",
+        urls: privates.map(e => e.url),
+        incognito: true,
+      });
     }
-    PORT.postMessage({
-      msg: "openUrls",
-      urls: items.map(e => e.url)
-    });
   }
 
   applyDeltaTo(delta: ItemDelta[], items: ItemCollection) {
@@ -494,7 +574,7 @@ class SelectionTable extends VirtualTable {
     else {
       this.status.textContent = _("numitems.label", [selected]);
     }
-    cleaErrors();
+    clearErrors();
   }
 
   getRowClasses(rowid: number) {
@@ -502,7 +582,11 @@ class SelectionTable extends VirtualTable {
     if (!item || !matched(item) || !item.matched) {
       return null;
     }
-    return ["filtered", this.checkClasser.get(item.matched)];
+    const m = this.checkClasser.get(item.matched);
+    if (!m) {
+      return null;
+    }
+    return ["filtered", m];
   }
 
   getCellIcon(rowid: number, colid: number) {
@@ -591,6 +675,9 @@ async function download(paused = false) {
     if (!mask) {
       throw new Error("error.invalidMask");
     }
+    const subfolder = Subfolder.value;
+    validateSubfolder(subfolder);
+
     const items = Table.items.checkedIndexes;
     if (!items.length) {
       throw new Error("error.noItemsSelected");
@@ -624,6 +711,8 @@ async function download(paused = false) {
         maskOnce: $<HTMLInputElement>("#maskOnceCheck").checked,
         fast: FastFilter.value,
         fastOnce: $<HTMLInputElement>("#fastOnceCheck").checked,
+        subfolder,
+        subfolderOnce: $<HTMLInputElement>("#subfolderOnceCheck").checked,
       }
     });
   }
@@ -699,9 +788,9 @@ function cancel() {
 }
 
 async function init() {
-  await Promise.all([MASK.init(), FASTFILTER.init()]);
+  await Promise.all([MASK.init(), FASTFILTER.init(), SUBFOLDER.init()]);
   Mask = new Dropdown("#mask", MASK.values);
-  Mask.on("changed", cleaErrors);
+  Mask.on("changed", clearErrors);
   FastFilter = new Dropdown("#fast", FASTFILTER.values);
   FastFilter.on("changed", () => {
     PORT.postMessage({
@@ -709,6 +798,8 @@ async function init() {
       fastFilter: FastFilter.value
     });
   });
+  Subfolder = new Dropdown("#subfolder", SUBFOLDER.values);
+  Subfolder.on("changed", clearErrors);
 }
 
 const LOADED = new Promise(resolve => {

windows/single.html

@@ -47,6 +47,15 @@
         <span data-i18n="useonlyonce">Use only once</span>
       </label>
     </div>
+    <h3 data-i18n="subfolder"></h3>
+    <div id="subfolderOptions">
+      <input type="text" id="subfolder" data-i18n="placeholder=subfolder.placeholder">
+      <span></span>
+      <label id="subfolderOnce">
+        <input type="checkbox" id="subfolderOnceCheck">
+        <span data-i18n="useonlyonce">Use only once</span>
+      </label>
+    </div>
   </section>
   <section id="notification"></section>
   <section id="buttons">

windows/single.ts

@@ -6,7 +6,7 @@ import ModalDialog from "../uikit/lib/modal";
 import { _, localize } from "../lib/i18n";
 // eslint-disable-next-line no-unused-vars
 import { Item, BaseItem } from "../lib/item";
-import { MASK } from "../lib/recentlist";
+import { MASK, SUBFOLDER } from "../lib/recentlist";
 import { BatchGenerator } from "../lib/batches";
 import { WindowState } from "./windowstate";
 import { Dropdown } from "./dropdown";
@@ -14,11 +14,13 @@ import { Keys } from "./keys";
 import { hookButton } from "../lib/manager/renamer";
 import { runtime } from "../lib/browser";
 import { $ } from "./winutil";
+import { validateSubFolder } from "../lib/util";
 
 const PORT = runtime.connect(null, { name: "single" });
 
 let ITEM: BaseItem;
 let Mask: Dropdown;
+let Subfolder: Dropdown;
 
 class BatchModalDialog extends ModalDialog {
   private readonly gen: BatchGenerator;
@@ -71,7 +73,8 @@ function setItem(item: BaseItem) {
     title = "",
     description = "",
     usableReferrer = "",
-    mask = ""
+    mask = "",
+    subfolder = "",
   } = item;
   $<HTMLInputElement>("#URL").value = usable;
   $<HTMLInputElement>("#filename").value = fileName;
@@ -81,6 +84,9 @@ function setItem(item: BaseItem) {
   if (mask) {
     Mask.value = mask;
   }
+  if (subfolder) {
+    Subfolder.value = subfolder;
+  }
 }
 
 function displayError(err: string) {
@@ -124,6 +130,9 @@ async function downloadInternal(paused: boolean) {
     return displayError("error.invalidMask");
   }
 
+  const subfolder = Subfolder.value.trim();
+  validateSubFolder(subfolder);
+
   const items = [];
 
   if (!ITEM) {
@@ -136,6 +145,7 @@ async function downloadInternal(paused: boolean) {
       title,
       description,
       mask,
+      subfolder
     });
   }
   else {
@@ -143,6 +153,7 @@ async function downloadInternal(paused: boolean) {
     ITEM.title = title;
     ITEM.description = description;
     ITEM.mask = mask;
+    ITEM.subfolder = subfolder;
     if (usableReferrer !== ITEM.usableReferrer) {
       ITEM.referrer = referrer;
       ITEM.usableReferrer = usableReferrer;
@@ -185,6 +196,8 @@ async function downloadInternal(paused: boolean) {
       paused,
       mask,
       maskOnce: $<HTMLInputElement>("#maskOnceCheck").checked,
+      subfolder,
+      subfolderOnce: $<HTMLInputElement>("#subfolderOnceCheck").checked,
     }
   });
   return null;
@@ -201,8 +214,9 @@ function cancel() {
 
 async function init() {
   await localize(document.documentElement);
-  await Promise.all([MASK.init()]);
+  await Promise.all([MASK.init(), SUBFOLDER.init()]);
   Mask = new Dropdown("#mask", MASK.values);
+  Subfolder = new Dropdown("#subfolder", SUBFOLDER.values);
 }
 
 addEventListener("DOMContentLoaded", async function dom() {