Merge develop branch and fix conflicts

10 files changed, 12 insertions, 10 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 c4ec9026..7fb30df8 100644
--- a/share/locale/en.json
+++ b/share/locale/en.json
@@ -47,7 +47,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",
@@ -63,7 +63,7 @@
     "gui_receive_quit_warning": "You're in the process of receiving files. Are you sure you want to quit OnionShare?",
     "gui_quit_warning_quit": "Quit",
     "gui_quit_warning_dont_quit": "Cancel",
-    "error_rate_limit": "Someone has made too many wrong attempts on your address, which means they could be trying to guess it, so OnionShare has stopped the server. Start sharing again and send the receipient a new address to share.",
+    "error_rate_limit": "Someone has made too many wrong attempts on your address, which means they could be trying to guess it, so OnionShare has stopped the server. Start sharing again and send the recipient a new address to share.",
     "zip_progress_bar_format": "Compressing: %p%",
     "error_stealth_not_supported": "To use client authorization, you need at least both Tor 0.2.9.1-alpha (or Tor Browser 6.5) and python3-stem 1.5.0.",
     "error_ephemeral_not_supported": "OnionShare requires at least both Tor 0.2.7.1 and python3-stem 1.4.0.",
@@ -107,7 +107,6 @@
     "gui_settings_button_help": "Help",
     "gui_settings_shutdown_timeout_checkbox": "Use auto-stop timer",
     "gui_settings_shutdown_timeout": "Stop the share at:",
-    "settings_saved": "Settings saved in {}",
     "settings_error_unknown": "Can't connect to Tor controller because your settings don't make sense.",
     "settings_error_automatic": "Could not connect to the Tor controller. Is Tor Browser (available from torproject.org) running in the background?",
     "settings_error_socket_port": "Can't connect to the Tor controller at {}:{}.",
@@ -152,12 +151,11 @@
     "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: {}",
-    "error_downloads_dir_not_writable": "The receive mode folder is write protected: {}",
     "receive_mode_downloads_dir": "Files sent to you appear in this folder: {}",
     "receive_mode_warning": "Warning: Receive mode lets people upload files to your computer. Some files can potentially take control of your computer if you open them. Only open things from people you trust, or if you know what you are doing.",
     "gui_receive_mode_warning": "Receive mode lets people upload files to your computer.<br><br><b>Some files can potentially take control of your computer if you open them. Only open things from people you trust, or if you know what you are doing.</b>",
@@ -175,10 +173,13 @@
     "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_open_folder_error_nautilus": "Cannot open folder because nautilus is not available. The file is here: {}"
+    "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."
 }
diff --git a/share/locale/fr.json b/share/locale/fr.json
index 967e456e..ee206662 100644
--- a/share/locale/fr.json
+++ b/share/locale/fr.json
@@ -29,5 +29,6 @@
     "gui_please_wait": "Attendez-vous...",
     "gui_quit_warning_quit": "Quitter",
     "gui_quit_warning_dont_quit": "Ne quitter pas",
-    "gui_settings_autoupdate_timestamp_never": "Jamais"
+    "gui_settings_autoupdate_timestamp_never": "Jamais",
+    "gui_settings_language_changed_notice": "Redémarrez OnionShare pour que votre changement de langue prenne effet"
 }