Merge branch '780_improved_ui' into 690_language_dropdown

9 files changed, 6 insertions, 5 deletions

diff --git a/share/images/downloads.png b/share/images/downloads.png
new file mode 100644
index 00000000..ad879b6e
--- /dev/null
+++ b/share/images/downloads.png
diff --git a/share/images/downloads_toggle.png b/share/images/downloads_toggle.png
new file mode 100644
index 00000000..846ececb
--- /dev/null
+++ b/share/images/downloads_toggle.png
diff --git a/share/images/downloads_toggle_selected.png b/share/images/downloads_toggle_selected.png
new file mode 100644
index 00000000..127ce208
--- /dev/null
+++ b/share/images/downloads_toggle_selected.png
diff --git a/share/images/downloads_transparent.png b/share/images/downloads_transparent.png
new file mode 100644
index 00000000..99207097
--- /dev/null
+++ b/share/images/downloads_transparent.png
diff --git a/share/images/uploads.png b/share/images/uploads.png
new file mode 100644
index 00000000..cd9bd98e
--- /dev/null
+++ b/share/images/uploads.png
diff --git a/share/images/uploads_toggle.png b/share/images/uploads_toggle.png
new file mode 100644
index 00000000..87303c9f
--- /dev/null
+++ b/share/images/uploads_toggle.png
diff --git a/share/images/uploads_toggle_selected.png b/share/images/uploads_toggle_selected.png
new file mode 100644
index 00000000..0ba52cff
--- /dev/null
+++ b/share/images/uploads_toggle_selected.png
diff --git a/share/images/uploads_transparent.png b/share/images/uploads_transparent.png
new file mode 100644
index 00000000..3648c3fb
--- /dev/null
+++ b/share/images/uploads_transparent.png
diff --git a/share/locale/en.json b/share/locale/en.json
index f5d887b5..db416c9b 100644
--- a/share/locale/en.json
+++ b/share/locale/en.json
@@ -46,7 +46,7 @@
     "gui_copy_url": "Copy Address",
     "gui_copy_hidservauth": "Copy HidServAuth",
     "gui_downloads": "Download History",
-    "gui_no_downloads": "No downloads yet.",
+    "gui_no_downloads": "No Downloads Yet",
     "gui_canceled": "Canceled",
     "gui_copied_url_title": "Copied OnionShare Address",
     "gui_copied_url": "OnionShare address copied to clipboard",
@@ -150,8 +150,8 @@
     "gui_status_indicator_receive_started": "Receiving",
     "gui_file_info": "{} files, {}",
     "gui_file_info_single": "{} file, {}",
-    "info_in_progress_downloads_tooltip": "{} download(s) in progress",
-    "info_completed_downloads_tooltip": "{} download(s) completed",
+    "history_in_progress_tooltip": "{} in progress",
+    "history_completed_tooltip": "{} completed",
     "info_in_progress_uploads_tooltip": "{} upload(s) in progress",
     "info_completed_uploads_tooltip": "{} upload(s) completed",
     "error_cannot_create_downloads_dir": "Could not create receive mode folder: {}",
@@ -174,11 +174,12 @@
     "systray_download_page_loaded_message": "A user loaded the download page",
     "systray_upload_page_loaded_message": "A user loaded the upload page",
     "gui_uploads": "Upload History",
-    "gui_no_uploads": "No uploads yet.",
-    "gui_clear_history": "Clear history",
+    "gui_no_uploads": "No Uploads Yet",
+    "gui_clear_history": "Clear All",
     "gui_upload_in_progress": "Upload Started {}",
     "gui_upload_finished_range": "Uploaded {} to {}",
     "gui_upload_finished": "Uploaded {}",
+    "gui_download_in_progress": "Download Started {}",
     "gui_open_folder_error_nautilus": "Cannot open folder because nautilus is not available. The file is here: {}",
     "gui_settings_language_label": "Preferred language",
     "gui_settings_language_changed_notice": "Restart OnionShare for your change in language to take effect."