Fix merge conflicts with upstream

2 files changed, 4 insertions, 16 deletions

diff --git a/onionshare_gui/mode/website_mode/__init__.py b/onionshare_gui/mode/website_mode/__init__.py
index e2c5bd72..156f578e 100644
--- a/onionshare_gui/mode/website_mode/__init__.py
+++ b/onionshare_gui/mode/website_mode/__init__.py
@@ -75,9 +75,9 @@ class WebsiteMode(Mode):
         # Download history
         self.history = History(
             self.common,
-            QtGui.QPixmap.fromImage(QtGui.QImage(self.common.get_resource_path('images/downloads_transparent.png'))),
-            strings._('gui_no_downloads'),
-            strings._('gui_downloads')
+            QtGui.QPixmap.fromImage(QtGui.QImage(self.common.get_resource_path('images/share_icon_transparent.png'))),
+            strings._('gui_share_mode_no_files'),
+            strings._('gui_all_modes_history')
         )
         self.history.hide()
 
@@ -216,7 +216,7 @@ class WebsiteMode(Mode):
         """
         Handle REQUEST_LOAD event.
         """
-        self.system_tray.showMessage(strings._('systray_site_loaded_title'), strings._('systray_site_page_loaded_message'))
+        self.system_tray.showMessage(strings._('systray_site_loaded_title'), strings._('systray_site_loaded_message'))
 
     def handle_request_started(self, event):
         """
diff --git a/onionshare_gui/server_status.py b/onionshare_gui/server_status.py
index 755904ea..e8385e64 100644
--- a/onionshare_gui/server_status.py
+++ b/onionshare_gui/server_status.py
@@ -289,23 +289,11 @@ class ServerStatus(QtWidgets.QWidget):
                     self.server_button.setText(strings._('gui_share_stop_server'))
                 else:
                     self.server_button.setText(strings._('gui_receive_stop_server'))
-<<<<<<< HEAD
                 if self.common.settings.get('autostart_timer'):
                     self.autostart_timer_container.hide()
                 if self.common.settings.get('autostop_timer'):
                     self.autostop_timer_container.hide()
                     self.server_button.setToolTip(strings._('gui_stop_server_autostop_timer_tooltip').format(self.autostop_timer_widget.dateTime().toString("h:mm AP, MMMM dd, yyyy")))
-=======
-                if self.common.settings.get('shutdown_timeout'):
-                    self.shutdown_timeout_container.hide()
-                    if self.mode == ServerStatus.MODE_SHARE:
-                        self.server_button.setToolTip(strings._('gui_share_stop_server_shutdown_timeout_tooltip').format(self.timeout))
-                    if self.mode == ServerStatus.MODE_WEBSITE:
-                        self.server_button.setToolTip(strings._('gui_share_stop_server_shutdown_timeout_tooltip').format(self.timeout))
-                    else:
-                        self.server_button.setToolTip(strings._('gui_receive_stop_server_shutdown_timeout_tooltip').format(self.timeout))
-
->>>>>>> Add gui for website sharing and listing
             elif self.status == self.STATUS_WORKING:
                 self.server_button.setStyleSheet(self.common.css['server_status_button_working'])
                 self.server_button.setEnabled(True)