Standardise all shutdown_timer, shutdown_timeout, timeout attributes as 'autostop_timer'

65 files changed, 574 insertions, 574 deletions

diff --git a/onionshare/__init__.py b/onionshare/__init__.py
index 616cf9db..722b4018 100644
--- a/onionshare/__init__.py
+++ b/onionshare/__init__.py
@@ -136,9 +136,9 @@ def main(cwd=None):
         app.choose_port()
         # Delay the startup if a startup timer was set
         if autostart_timer > 0:
-            # Can't set a schedule that is later than the shutdown timer
-            if app.shutdown_timeout > 0 and app.shutdown_timeout < autostart_timer:
-                print(strings._('gui_timeout_cant_be_earlier_than_startup'))
+            # Can't set a schedule that is later than the auto-stop timer
+            if app.autostop_timer > 0 and app.autostop_timer < autostart_timer:
+                print(strings._('gui_autostop_timer_cant_be_earlier_than_startup'))
                 sys.exit()
 
             app.start_onion_service(False, True)
@@ -204,9 +204,9 @@ def main(cwd=None):
         # Wait for web.generate_slug() to finish running
         time.sleep(0.2)
 
-        # start shutdown timer thread
-        if app.shutdown_timeout > 0:
-            app.shutdown_timer.start()
+        # start auto-stop timer thread
+        if app.autostop_timer > 0:
+            app.autostop_timer_thread.start()
 
         # Save the web slug if we are using a persistent private key
         if common.settings.get('save_private_key'):
@@ -250,18 +250,18 @@ def main(cwd=None):
 
         # Wait for app to close
         while t.is_alive():
-            if app.shutdown_timeout > 0:
-                # if the shutdown timer was set and has run out, stop the server
-                if not app.shutdown_timer.is_alive():
+            if app.autostop_timer > 0:
+                # if the auto-stop timer was set and has run out, stop the server
+                if not app.autostop_timer_thread.is_alive():
                     if mode == 'share':
                         # If there were no attempts to download the share, or all downloads are done, we can stop
                         if web.share_mode.download_count == 0 or web.done:
-                            print(strings._("close_on_timeout"))
+                            print(strings._("close_on_autostop_timer"))
                             web.stop(app.port)
                             break
                     if mode == 'receive':
                         if web.receive_mode.upload_count == 0 or not web.receive_mode.uploads_in_progress:
-                            print(strings._("close_on_timeout"))
+                            print(strings._("close_on_autostop_timer"))
                             web.stop(app.port)
                             break
                         else:
diff --git a/onionshare/common.py b/onionshare/common.py
index fcb9ca6d..02668507 100644
--- a/onionshare/common.py
+++ b/onionshare/common.py
@@ -485,7 +485,7 @@ class Common(object):
         return total_size
 
 
-class ShutdownTimer(threading.Thread):
+class AutoStopTimer(threading.Thread):
     """
     Background thread sleeps t hours and returns.
     """
@@ -498,6 +498,6 @@ class ShutdownTimer(threading.Thread):
         self.time = time
 
     def run(self):
-        self.common.log('Shutdown Timer', 'Server will shut down after {} seconds'.format(self.time))
+        self.common.log('AutoStopTimer', 'Server will shut down after {} seconds'.format(self.time))
         time.sleep(self.time)
         return 1
diff --git a/onionshare/onionshare.py b/onionshare/onionshare.py
index 6598b975..e746bae1 100644
--- a/onionshare/onionshare.py
+++ b/onionshare/onionshare.py
@@ -22,14 +22,14 @@ import os, shutil
 
 from . import common, strings
 from .onion import TorTooOld, TorErrorProtocolError
-from .common import ShutdownTimer
+from .common import AutoStopTimer 
 
 class OnionShare(object):
     """
     OnionShare is the main application class. Pass in options and run
     start_onion_service and it will do the magic.
     """
-    def __init__(self, common, onion, local_only=False, shutdown_timeout=0):
+    def __init__(self, common, onion, local_only=False, autostop_timer=0):
         self.common = common
 
         self.common.log('OnionShare', '__init__')
@@ -49,9 +49,9 @@ class OnionShare(object):
         self.local_only = local_only
 
         # optionally shut down after N hours
-        self.shutdown_timeout = shutdown_timeout
-        # init timing thread
-        self.shutdown_timer = None
+        self.autostop_timer = autostop_timer
+        # init auto-stop timer thread
+        self.autostop_timer_thread = None
 
     def set_stealth(self, stealth):
         self.common.log('OnionShare', 'set_stealth', 'stealth={}'.format(stealth))
@@ -77,8 +77,8 @@ class OnionShare(object):
         if not self.port:
             self.choose_port()
 
-        if self.shutdown_timeout > 0:
-            self.shutdown_timer = ShutdownTimer(self.common, self.shutdown_timeout)
+        if self.autostop_timer > 0:
+            self.autostop_timer_thread = AutoStopTimer(self.common, self.autostop_timer)
 
         if self.local_only:
             self.onion_host = '127.0.0.1:{0:d}'.format(self.port)
diff --git a/onionshare/settings.py b/onionshare/settings.py
index d015c5ce..a5d4db6a 100644
--- a/onionshare/settings.py
+++ b/onionshare/settings.py
@@ -84,7 +84,7 @@ class Settings(object):
             'auth_type': 'no_auth',
             'auth_password': '',
             'close_after_first_download': True,
-            'shutdown_timeout': False,
+            'autostop_timer': False,
             'startup_timer': False,
             'use_stealth': False,
             'use_autoupdate': True,
diff --git a/onionshare_gui/mode/__init__.py b/onionshare_gui/mode/__init__.py
index f1184f2d..954bcc4d 100644
--- a/onionshare_gui/mode/__init__.py
+++ b/onionshare_gui/mode/__init__.py
@@ -20,7 +20,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 from PyQt5 import QtCore, QtWidgets, QtGui
 
 from onionshare import strings
-from onionshare.common import ShutdownTimer
+from onionshare.common import AutoStopTimer
 
 from ..server_status import ServerStatus
 from ..threads import OnionThread
@@ -127,20 +127,20 @@ class Mode(QtWidgets.QWidget):
                 else:
                     self.server_status.server_button.setText(strings._('gui_please_wait'))
 
-        # If the auto-shutdown timer has stopped, stop the server
+        # If the auto-stop timer has stopped, stop the server
         if self.server_status.status == ServerStatus.STATUS_STARTED:
-            if self.app.shutdown_timer and self.common.settings.get('shutdown_timeout'):
-                if self.timeout > 0:
+            if self.app.autostop_timer_thread and self.common.settings.get('autostop_timer'):
+                if self.autostop_timer_datetime_delta > 0:
                     now = QtCore.QDateTime.currentDateTime()
-                    seconds_remaining = now.secsTo(self.server_status.timeout)
+                    seconds_remaining = now.secsTo(self.server_status.autostop_timer_datetime)
 
                     # Update the server button
-                    server_button_text = self.get_stop_server_shutdown_timeout_text()
+                    server_button_text = self.get_stop_server_autostop_timer_text()
                     self.server_status.server_button.setText(server_button_text.format(self.human_friendly_time(seconds_remaining)))
 
                     self.status_bar.clearMessage()
-                    if not self.app.shutdown_timer.is_alive():
-                        if self.timeout_finished_should_stop_server():
+                    if not self.app.autostop_timer_thread.is_alive():
+                        if self.autostop_timer_finished_should_stop_server():
                             self.server_status.stop_server()
 
     def timer_callback_custom(self):
@@ -149,15 +149,15 @@ class Mode(QtWidgets.QWidget):
         """
         pass
 
-    def get_stop_server_shutdown_timeout_text(self):
+    def get_stop_server_autostop_timer_text(self):
         """
-        Return the string to put on the stop server button, if there's a shutdown timeout
+        Return the string to put on the stop server button, if there's an auto-stop timer
         """
         pass
 
-    def timeout_finished_should_stop_server(self):
+    def autostop_timer_finished_should_stop_server(self):
         """
-        The shutdown timer expired, should we stop the server? Returns a bool
+        The auto-stop timer expired, should we stop the server? Returns a bool
         """
         pass
 
@@ -259,18 +259,18 @@ class Mode(QtWidgets.QWidget):
 
         self.start_server_step3_custom()
 
-        if self.common.settings.get('shutdown_timeout'):
+        if self.common.settings.get('autostop_timer'):
             # Convert the date value to seconds between now and then
             now = QtCore.QDateTime.currentDateTime()
-            self.timeout = now.secsTo(self.server_status.timeout)
-            # Set the shutdown timeout value
-            if self.timeout > 0:
-                self.app.shutdown_timer = ShutdownTimer(self.common, self.timeout)
-                self.app.shutdown_timer.start()
-            # The timeout has actually already passed since the user clicked Start. Probably the Onion service took too long to start.
+            self.autostop_timer_datetime_delta = now.secsTo(self.server_status.autostop_timer_datetime)
+            # Start the auto-stop timer
+            if self.autostop_timer_datetime_delta > 0:
+                self.app.autostop_timer_thread = AutoStopTimer(self.common, self.autostop_timer_datetime_delta)
+                self.app.autostop_timer_thread.start()
+            # The auto-stop timer has actually already passed since the user clicked Start. Probably the Onion service took too long to start.
             else:
                 self.stop_server()
-                self.start_server_error(strings._('gui_server_started_after_timeout'))
+                self.start_server_error(strings._('gui_server_started_after_autostop_timer'))
 
     def start_server_step3_custom(self):
         """
diff --git a/onionshare_gui/mode/receive_mode/__init__.py b/onionshare_gui/mode/receive_mode/__init__.py
index 5fb33ab3..4c0b49ba 100644
--- a/onionshare_gui/mode/receive_mode/__init__.py
+++ b/onionshare_gui/mode/receive_mode/__init__.py
@@ -86,24 +86,24 @@ class ReceiveMode(Mode):
         self.wrapper_layout.addWidget(self.history, stretch=1)
         self.setLayout(self.wrapper_layout)
 
-    def get_stop_server_shutdown_timeout_text(self):
+    def get_stop_server_autostop_timer_text(self):
         """
-        Return the string to put on the stop server button, if there's a shutdown timeout
+        Return the string to put on the stop server button, if there's an auto-stop timer
         """
-        return strings._('gui_receive_stop_server_shutdown_timeout')
+        return strings._('gui_receive_stop_server_autostop_timer')
 
-    def timeout_finished_should_stop_server(self):
+    def autostop_timer_finished_should_stop_server(self):
         """
-        The shutdown timer expired, should we stop the server? Returns a bool
+        The auto-stop timer expired, should we stop the server? Returns a bool
         """
         # If there were no attempts to upload files, or all uploads are done, we can stop
         if self.web.receive_mode.upload_count == 0 or not self.web.receive_mode.uploads_in_progress:
             self.server_status.stop_server()
-            self.server_status_label.setText(strings._('close_on_timeout'))
+            self.server_status_label.setText(strings._('close_on_autostop_timer'))
             return True
         # An upload is probably still running - hold off on stopping the share, but block new shares.
         else:
-            self.server_status_label.setText(strings._('gui_receive_mode_timeout_waiting'))
+            self.server_status_label.setText(strings._('gui_receive_mode_autostop_timer_waiting'))
             self.web.receive_mode.can_upload = False
             return False
 
diff --git a/onionshare_gui/mode/share_mode/__init__.py b/onionshare_gui/mode/share_mode/__init__.py
index 1f5ad00b..6cb50b2b 100644
--- a/onionshare_gui/mode/share_mode/__init__.py
+++ b/onionshare_gui/mode/share_mode/__init__.py
@@ -121,24 +121,24 @@ class ShareMode(Mode):
         # Always start with focus on file selection
         self.file_selection.setFocus()
 
-    def get_stop_server_shutdown_timeout_text(self):
+    def get_stop_server_autostop_timer_text(self):
         """
-        Return the string to put on the stop server button, if there's a shutdown timeout
+        Return the string to put on the stop server button, if there's an auto-stop timer
         """
-        return strings._('gui_share_stop_server_shutdown_timeout')
+        return strings._('gui_share_stop_server_autostop_timer')
 
-    def timeout_finished_should_stop_server(self):
+    def autostop_timer_finished_should_stop_server(self):
         """
-        The shutdown timer expired, should we stop the server? Returns a bool
+        The auto-stop timer expired, should we stop the server? Returns a bool
         """
         # If there were no attempts to download the share, or all downloads are done, we can stop
         if self.web.share_mode.download_count == 0 or self.web.done:
             self.server_status.stop_server()
-            self.server_status_label.setText(strings._('close_on_timeout'))
+            self.server_status_label.setText(strings._('close_on_autostop_timer'))
             return True
         # A download is probably still running - hold off on stopping the share
         else:
-            self.server_status_label.setText(strings._('gui_share_mode_timeout_waiting'))
+            self.server_status_label.setText(strings._('gui_share_mode_autostop_timer_waiting'))
             return False
 
     def start_server_custom(self):
diff --git a/onionshare_gui/onionshare_gui.py b/onionshare_gui/onionshare_gui.py
index e57d8c83..0627d205 100644
--- a/onionshare_gui/onionshare_gui.py
+++ b/onionshare_gui/onionshare_gui.py
@@ -315,10 +315,10 @@ class OnionShareGui(QtWidgets.QMainWindow):
                     self.receive_mode.on_reload_settings()
                     self.status_bar.clearMessage()
 
-            # If we switched off the shutdown timeout setting, ensure the widget is hidden.
-            if not self.common.settings.get('shutdown_timeout'):
-                self.share_mode.server_status.shutdown_timeout_container.hide()
-                self.receive_mode.server_status.shutdown_timeout_container.hide()
+            # If we switched off the auto-stop timer setting, ensure the widget is hidden.
+            if not self.common.settings.get('autostop_timer'):
+                self.share_mode.server_status.autostop_timer_container.hide()
+                self.receive_mode.server_status.autostop_timer_container.hide()
             # If we switched off the startup timer setting, ensure the widget is hidden.
             if not self.common.settings.get('startup_timer'):
                 self.share_mode.server_status.scheduled_start = None
diff --git a/onionshare_gui/server_status.py b/onionshare_gui/server_status.py
index 6a2b883b..d05c8251 100644
--- a/onionshare_gui/server_status.py
+++ b/onionshare_gui/server_status.py
@@ -86,30 +86,30 @@ class ServerStatus(QtWidgets.QWidget):
         self.startup_timer_container.setLayout(startup_timer_container_layout)
         self.startup_timer_container.hide()
 
-        # Shutdown timeout layout
-        self.shutdown_timeout_label = QtWidgets.QLabel(strings._('gui_settings_shutdown_timeout'))
-        self.shutdown_timeout = QtWidgets.QDateTimeEdit()
-        self.shutdown_timeout.setDisplayFormat("hh:mm A MMM d, yy")
+        # Auto-stop timer layout
+        self.autostop_timer_label = QtWidgets.QLabel(strings._('gui_settings_autostop_timer'))
+        self.autostop_timer_widget = QtWidgets.QDateTimeEdit()
+        self.autostop_timer_widget.setDisplayFormat("hh:mm A MMM d, yy")
         if self.local_only:
             # For testing
-            self.shutdown_timeout.setDateTime(QtCore.QDateTime.currentDateTime().addSecs(15))
-            self.shutdown_timeout.setMinimumDateTime(QtCore.QDateTime.currentDateTime())
+            self.autostop_timer_widget.setDateTime(QtCore.QDateTime.currentDateTime().addSecs(15))
+            self.autostop_timer_widget.setMinimumDateTime(QtCore.QDateTime.currentDateTime())
         else:
-            # Set proposed timeout to be 5 minutes into the future
-            self.shutdown_timeout.setDateTime(QtCore.QDateTime.currentDateTime().addSecs(300))
+            # Set proposed timer to be 5 minutes into the future
+            self.autostop_timer_widget.setDateTime(QtCore.QDateTime.currentDateTime().addSecs(300))
             # Onion services can take a little while to start, so reduce the risk of it expiring too soon by setting the minimum to 60s from now
-            self.shutdown_timeout.setMinimumDateTime(QtCore.QDateTime.currentDateTime().addSecs(60))
-        self.shutdown_timeout.setCurrentSection(QtWidgets.QDateTimeEdit.MinuteSection)
-        shutdown_timeout_layout = QtWidgets.QHBoxLayout()
-        shutdown_timeout_layout.addWidget(self.shutdown_timeout_label)
-        shutdown_timeout_layout.addWidget(self.shutdown_timeout)
-
-        # Shutdown timeout container, so it can all be hidden and shown as a group
-        shutdown_timeout_container_layout = QtWidgets.QVBoxLayout()
-        shutdown_timeout_container_layout.addLayout(shutdown_timeout_layout)
-        self.shutdown_timeout_container = QtWidgets.QWidget()
-        self.shutdown_timeout_container.setLayout(shutdown_timeout_container_layout)
-        self.shutdown_timeout_container.hide()
+            self.autostop_timer_widget.setMinimumDateTime(QtCore.QDateTime.currentDateTime().addSecs(60))
+        self.autostop_timer_widget.setCurrentSection(QtWidgets.QDateTimeEdit.MinuteSection)
+        autostop_timer_layout = QtWidgets.QHBoxLayout()
+        autostop_timer_layout.addWidget(self.autostop_timer_label)
+        autostop_timer_layout.addWidget(self.autostop_timer_widget)
+
+        # Auto-stop timer container, so it can all be hidden and shown as a group
+        autostop_timer_container_layout = QtWidgets.QVBoxLayout()
+        autostop_timer_container_layout.addLayout(autostop_timer_layout)
+        self.autostop_timer_container = QtWidgets.QWidget()
+        self.autostop_timer_container.setLayout(autostop_timer_container_layout)
+        self.autostop_timer_container.hide()
 
         # Server layout
         self.server_button = QtWidgets.QPushButton()
@@ -150,7 +150,7 @@ class ServerStatus(QtWidgets.QWidget):
         layout.addWidget(self.server_button)
         layout.addLayout(url_layout)
         layout.addWidget(self.startup_timer_container)
-        layout.addWidget(self.shutdown_timeout_container)
+        layout.addWidget(self.autostop_timer_container)
         self.setLayout(layout)
 
     def set_mode(self, share_mode, file_selection=None):
@@ -189,13 +189,13 @@ class ServerStatus(QtWidgets.QWidget):
         if not self.local_only:
             self.startup_timer.setMinimumDateTime(QtCore.QDateTime.currentDateTime().addSecs(60))
 
-    def shutdown_timeout_reset(self):
+    def autostop_timer_reset(self):
         """
-        Reset the timeout in the UI after stopping a share
+        Reset the auto-stop timer in the UI after stopping a share
         """
-        self.shutdown_timeout.setDateTime(QtCore.QDateTime.currentDateTime().addSecs(300))
+        self.autostop_timer_widget.setDateTime(QtCore.QDateTime.currentDateTime().addSecs(300))
         if not self.local_only:
-            self.shutdown_timeout.setMinimumDateTime(QtCore.QDateTime.currentDateTime().addSecs(60))
+            self.autostop_timer_widget.setMinimumDateTime(QtCore.QDateTime.currentDateTime().addSecs(60))
 
     def show_url(self):
         """
@@ -247,8 +247,8 @@ class ServerStatus(QtWidgets.QWidget):
             if self.common.settings.get('startup_timer'):
                 self.startup_timer_container.hide()
 
-            if self.common.settings.get('shutdown_timeout'):
-                self.shutdown_timeout_container.hide()
+            if self.common.settings.get('autostop_timer'):
+                self.autostop_timer_container.hide()
         else:
             self.url_description.hide()
             self.url.hide()
@@ -271,8 +271,8 @@ class ServerStatus(QtWidgets.QWidget):
                 self.server_button.setToolTip('')
                 if self.common.settings.get('startup_timer'):
                     self.startup_timer_container.show()
-                if self.common.settings.get('shutdown_timeout'):
-                    self.shutdown_timeout_container.show()
+                if self.common.settings.get('autostop_timer'):
+                    self.autostop_timer_container.show()
             elif self.status == self.STATUS_STARTED:
                 self.server_button.setStyleSheet(self.common.css['server_status_button_started'])
                 self.server_button.setEnabled(True)
@@ -282,9 +282,9 @@ class ServerStatus(QtWidgets.QWidget):
                     self.server_button.setText(strings._('gui_receive_stop_server'))
                 if self.common.settings.get('startup_timer'):
                     self.startup_timer_container.hide()
-                if self.common.settings.get('shutdown_timeout'):
-                    self.shutdown_timeout_container.hide()
-                    self.server_button.setToolTip(strings._('gui_stop_server_shutdown_timeout_tooltip').format(self.shutdown_timeout.dateTime().toString("H:mmAP, MMM dd, yy")))
+                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:mmAP, MMM dd, yy")))
             elif self.status == self.STATUS_WORKING:
                 self.server_button.setStyleSheet(self.common.css['server_status_button_working'])
                 self.server_button.setEnabled(True)
@@ -293,8 +293,8 @@ class ServerStatus(QtWidgets.QWidget):
                     self.server_button.setToolTip(strings._('gui_start_server_startup_timer_tooltip').format(self.startup_timer.dateTime().toString("H:mmAP, MMM dd, yy")))
                 else:
                     self.server_button.setText(strings._('gui_please_wait'))
-                if self.common.settings.get('shutdown_timeout'):
-                    self.shutdown_timeout_container.hide()
+                if self.common.settings.get('autostop_timer'):
+                    self.autostop_timer_container.hide()
             else:
                 self.server_button.setStyleSheet(self.common.css['server_status_button_working'])
                 self.server_button.setEnabled(False)
@@ -302,8 +302,8 @@ class ServerStatus(QtWidgets.QWidget):
                 if self.common.settings.get('startup_timer'):
                     self.startup_timer_container.hide()
                     self.server_button.setToolTip(strings._('gui_start_server_startup_timer_tooltip').format(self.startup_timer.dateTime().toString("H:mmAP, MMM dd, yy")))
-                if self.common.settings.get('shutdown_timeout'):
-                    self.shutdown_timeout_container.hide()
+                if self.common.settings.get('autostop_timer'):
+                    self.autostop_timer_container.hide()
 
     def server_button_clicked(self):
         """
@@ -320,19 +320,19 @@ class ServerStatus(QtWidgets.QWidget):
                 if QtCore.QDateTime.currentDateTime().toPyDateTime() > self.scheduled_start:
                     can_start = False
                     Alert(self.common, strings._('gui_server_startup_timer_expired'), QtWidgets.QMessageBox.Warning)
-            if self.common.settings.get('shutdown_timeout'):
+            if self.common.settings.get('autostop_timer'):
                 if self.local_only:
-                    self.timeout = self.shutdown_timeout.dateTime().toPyDateTime()
+                    self.autostop_timer_datetime = self.autostop_timer_widget.dateTime().toPyDateTime()
                 else:
-                    # Get the timeout chosen, stripped of its seconds. This prevents confusion if the share stops at (say) 37 seconds past the minute chosen
-                    self.timeout = self.shutdown_timeout.dateTime().toPyDateTime().replace(second=0, microsecond=0)
-                # If the timeout has actually passed already before the user hit Start, refuse to start the server.
-                if QtCore.QDateTime.currentDateTime().toPyDateTime() > self.timeout:
+                    # Get the timer chosen, stripped of its seconds. This prevents confusion if the share stops at (say) 37 seconds past the minute chosen
+                    self.autostop_timer_datetime = self.autostop_timer_widget.dateTime().toPyDateTime().replace(second=0, microsecond=0)
+                # If the timer has actually passed already before the user hit Start, refuse to start the server.
+                if QtCore.QDateTime.currentDateTime().toPyDateTime() > self.autostop_timer_datetime:
                     can_start = False
-                    Alert(self.common, strings._('gui_server_timeout_expired'), QtWidgets.QMessageBox.Warning)
+                    Alert(self.common, strings._('gui_server_autostop_timer_expired'), QtWidgets.QMessageBox.Warning)
                 if self.common.settings.get('startup_timer'):
-                    if self.timeout <= self.scheduled_start:
-                        Alert(self.common, strings._('gui_timeout_cant_be_earlier_than_startup'), QtWidgets.QMessageBox.Warning)
+                    if self.autostop_timer_datetime <= self.scheduled_start:
+                        Alert(self.common, strings._('gui_autostop_timer_cant_be_earlier_than_startup'), QtWidgets.QMessageBox.Warning)
                         can_start = False
             if can_start:
                 self.start_server()
@@ -365,7 +365,7 @@ class ServerStatus(QtWidgets.QWidget):
         """
         self.status = self.STATUS_WORKING
         self.startup_timer_reset()
-        self.shutdown_timeout_reset()
+        self.autostop_timer_reset()
         self.update()
         self.server_stopped.emit()
 
@@ -376,7 +376,7 @@ class ServerStatus(QtWidgets.QWidget):
         self.common.log('ServerStatus', 'cancel_server', 'Canceling the server mid-startup')
         self.status = self.STATUS_WORKING
         self.startup_timer_reset()
-        self.shutdown_timeout_reset()
+        self.autostop_timer_reset()
         self.update()
         self.server_canceled.emit()
 
diff --git a/onionshare_gui/settings_dialog.py b/onionshare_gui/settings_dialog.py
index 58fb2244..f5d9c85a 100644
--- a/onionshare_gui/settings_dialog.py
+++ b/onionshare_gui/settings_dialog.py
@@ -88,28 +88,28 @@ class SettingsDialog(QtWidgets.QDialog):
         self.startup_timer_widget = QtWidgets.QWidget()
         self.startup_timer_widget.setLayout(startup_timer_layout)
 
-        # Whether or not to use a shutdown ('auto-stop') timer
-        self.shutdown_timeout_checkbox = QtWidgets.QCheckBox()
-        self.shutdown_timeout_checkbox.setCheckState(QtCore.Qt.Checked)
-        self.shutdown_timeout_checkbox.setText(strings._("gui_settings_shutdown_timeout_checkbox"))
-        shutdown_timeout_label = QtWidgets.QLabel(strings._("gui_settings_whats_this").format("https://github.com/micahflee/onionshare/wiki/Using-the-Auto-Stop-Timer"))
-        shutdown_timeout_label.setStyleSheet(self.common.css['settings_whats_this'])
-        shutdown_timeout_label.setTextInteractionFlags(QtCore.Qt.TextBrowserInteraction)
-        shutdown_timeout_label.setOpenExternalLinks(True)
-        shutdown_timeout_label.setMinimumSize(public_mode_label.sizeHint())
-        shutdown_timeout_layout = QtWidgets.QHBoxLayout()
-        shutdown_timeout_layout.addWidget(self.shutdown_timeout_checkbox)
-        shutdown_timeout_layout.addWidget(shutdown_timeout_label)
-        shutdown_timeout_layout.addStretch()
-        shutdown_timeout_layout.setContentsMargins(0,0,0,0)
-        self.shutdown_timeout_widget = QtWidgets.QWidget()
-        self.shutdown_timeout_widget.setLayout(shutdown_timeout_layout)
+        # Whether or not to use an auto-stop timer
+        self.autostop_timer_checkbox = QtWidgets.QCheckBox()
+        self.autostop_timer_checkbox.setCheckState(QtCore.Qt.Checked)
+        self.autostop_timer_checkbox.setText(strings._("gui_settings_autostop_timer_checkbox"))
+        autostop_timer_label = QtWidgets.QLabel(strings._("gui_settings_whats_this").format("https://github.com/micahflee/onionshare/wiki/Using-the-Auto-Stop-Timer"))
+        autostop_timer_label.setStyleSheet(self.common.css['settings_whats_this'])
+        autostop_timer_label.setTextInteractionFlags(QtCore.Qt.TextBrowserInteraction)
+        autostop_timer_label.setOpenExternalLinks(True)
+        autostop_timer_label.setMinimumSize(public_mode_label.sizeHint())
+        autostop_timer_layout = QtWidgets.QHBoxLayout()
+        autostop_timer_layout.addWidget(self.autostop_timer_checkbox)
+        autostop_timer_layout.addWidget(autostop_timer_label)
+        autostop_timer_layout.addStretch()
+        autostop_timer_layout.setContentsMargins(0,0,0,0)
+        self.autostop_timer_widget = QtWidgets.QWidget()
+        self.autostop_timer_widget.setLayout(autostop_timer_layout)
 
         # General settings layout
         general_group_layout = QtWidgets.QVBoxLayout()
         general_group_layout.addWidget(self.public_mode_widget)
         general_group_layout.addWidget(self.startup_timer_widget)
-        general_group_layout.addWidget(self.shutdown_timeout_widget)
+        general_group_layout.addWidget(self.autostop_timer_widget)
         general_group = QtWidgets.QGroupBox(strings._("gui_settings_general_label"))
         general_group.setLayout(general_group_layout)
 
@@ -512,11 +512,11 @@ class SettingsDialog(QtWidgets.QDialog):
         else:
             self.startup_timer_checkbox.setCheckState(QtCore.Qt.Unchecked)
 
-        shutdown_timeout = self.old_settings.get('shutdown_timeout')
-        if shutdown_timeout:
-            self.shutdown_timeout_checkbox.setCheckState(QtCore.Qt.Checked)
+        autostop_timer = self.old_settings.get('autostop_timer')
+        if autostop_timer:
+            self.autostop_timer_checkbox.setCheckState(QtCore.Qt.Checked)
         else:
-            self.shutdown_timeout_checkbox.setCheckState(QtCore.Qt.Unchecked)
+            self.autostop_timer_checkbox.setCheckState(QtCore.Qt.Unchecked)
 
         save_private_key = self.old_settings.get('save_private_key')
         if save_private_key:
@@ -957,7 +957,7 @@ class SettingsDialog(QtWidgets.QDialog):
 
         settings.set('close_after_first_download', self.close_after_first_download_checkbox.isChecked())
         settings.set('startup_timer', self.startup_timer_checkbox.isChecked())
-        settings.set('shutdown_timeout', self.shutdown_timeout_checkbox.isChecked())
+        settings.set('autostop_timer', self.autostop_timer_checkbox.isChecked())
 
         # Complicated logic here to force v2 onion mode on or off depending on other settings
         if self.use_legacy_v2_onions_checkbox.isChecked():
diff --git a/share/locale/am.json b/share/locale/am.json
index 56705ebf..a911a5a4 100644
--- a/share/locale/am.json
+++ b/share/locale/am.json
@@ -10,7 +10,7 @@
     "not_a_readable_file": "",
     "no_available_port": "",
     "other_page_loaded": "",
-    "close_on_timeout": "",
+    "close_on_autostop_timer": "",
     "closing_automatically": "",
     "timeout_download_still_running": "",
     "timeout_upload_still_running": "",
@@ -38,12 +38,12 @@
     "gui_choose_items": "",
     "gui_share_start_server": "",
     "gui_share_stop_server": "",
-    "gui_share_stop_server_shutdown_timeout": "",
-    "gui_share_stop_server_shutdown_timeout_tooltip": "",
+    "gui_share_stop_server_autostop_timer": "",
+    "gui_share_stop_server_autostop_timer_tooltip": "",
     "gui_receive_start_server": "",
     "gui_receive_stop_server": "",
-    "gui_receive_stop_server_shutdown_timeout": "",
-    "gui_receive_stop_server_shutdown_timeout_tooltip": "",
+    "gui_receive_stop_server_autostop_timer": "",
+    "gui_receive_stop_server_autostop_timer_tooltip": "",
     "gui_copy_url": "",
     "gui_copy_hidservauth": "",
     "gui_downloads": "",
@@ -105,8 +105,8 @@
     "gui_settings_button_save": "",
     "gui_settings_button_cancel": "ተወው",
     "gui_settings_button_help": "መመሪያ",
-    "gui_settings_shutdown_timeout_checkbox": "",
-    "gui_settings_shutdown_timeout": "",
+    "gui_settings_autostop_timer_checkbox": "",
+    "gui_settings_autostop_timer": "",
     "settings_error_unknown": "",
     "settings_error_automatic": "",
     "settings_error_socket_port": "",
@@ -132,8 +132,8 @@
     "gui_tor_connection_error_settings": "",
     "gui_tor_connection_canceled": "",
     "gui_tor_connection_lost": "",
-    "gui_server_started_after_timeout": "",
-    "gui_server_timeout_expired": "",
+    "gui_server_started_after_autostop_timer": "",
+    "gui_server_autostop_timer_expired": "",
     "share_via_onionshare": "",
     "gui_use_legacy_v2_onions_checkbox": "",
     "gui_save_private_key_checkbox": "",
diff --git a/share/locale/ar.json b/share/locale/ar.json
index 458ae7bb..059a68f5 100644
--- a/share/locale/ar.json
+++ b/share/locale/ar.json
@@ -10,7 +10,7 @@
     "not_a_readable_file": "{0:s} ملف غير قابل للقراءة.",
     "no_available_port": "لا يوجد منفذ متاح لتشغيل (onion service)",
     "other_page_loaded": "تم تحميل العنوان",
-    "close_on_timeout": "",
+    "close_on_autostop_timer": "",
     "closing_automatically": "توقف بسبب انتهاء التحميل",
     "timeout_download_still_running": "انتظار اكتمال التحميل",
     "large_filesize": "تحذير: ارسال مشاركة كبيرة قد يستغرق ساعات",
@@ -37,12 +37,12 @@
     "gui_choose_items": "إختر",
     "gui_share_start_server": "ابدأ المشاركة",
     "gui_share_stop_server": "أوقف المشاركة",
-    "gui_share_stop_server_shutdown_timeout": "",
-    "gui_share_stop_server_shutdown_timeout_tooltip": "",
+    "gui_share_stop_server_autostop_timer": "",
+    "gui_share_stop_server_autostop_timer_tooltip": "",
     "gui_receive_start_server": "",
     "gui_receive_stop_server": "",
-    "gui_receive_stop_server_shutdown_timeout": "",
-    "gui_receive_stop_server_shutdown_timeout_tooltip": "",
+    "gui_receive_stop_server_autostop_timer": "",
+    "gui_receive_stop_server_autostop_timer_tooltip": "",
     "gui_copy_url": "نسخ العنوان",
     "gui_copy_hidservauth": "",
     "gui_downloads": "",
@@ -104,8 +104,8 @@
     "gui_settings_button_save": "حفظ",
     "gui_settings_button_cancel": "إلغاء",
     "gui_settings_button_help": "مساعدة",
-    "gui_settings_shutdown_timeout_checkbox": "",
-    "gui_settings_shutdown_timeout": "إيقاف المشاركة يوم:",
+    "gui_settings_autostop_timer_checkbox": "",
+    "gui_settings_autostop_timer": "إيقاف المشاركة يوم:",
     "settings_error_unknown": "",
     "settings_error_automatic": "",
     "settings_error_socket_port": "لا يمكن الاتصال بوحدة تحكم تور في {}:{}.",
@@ -131,8 +131,8 @@
     "gui_tor_connection_error_settings": "",
     "gui_tor_connection_canceled": "",
     "gui_tor_connection_lost": "غير متصل بشبكة تور.",
-    "gui_server_started_after_timeout": "",
-    "gui_server_timeout_expired": "",
+    "gui_server_started_after_autostop_timer": "",
+    "gui_server_autostop_timer_expired": "",
     "share_via_onionshare": "",
     "gui_use_legacy_v2_onions_checkbox": "استخدم العناوين الموروثة",
     "gui_save_private_key_checkbox": "استخدم عنوانا ثابتا",
@@ -201,7 +201,7 @@
     "gui_all_modes_history": "السجل الزمني",
     "gui_all_modes_clear_history": "مسح الكل",
     "gui_share_mode_no_files": "لم ترسل أية ملفات بعد",
-    "gui_share_mode_timeout_waiting": "في انتظار الانتهاء من الإرسال",
+    "gui_share_mode_autostop_timer_waiting": "في انتظار الانتهاء من الإرسال",
     "gui_receive_mode_no_files": "لم تتلق أية ملفات بعد",
-    "gui_receive_mode_timeout_waiting": "في انتظار الانتهاء من الاستلام"
+    "gui_receive_mode_autostop_timer_waiting": "في انتظار الانتهاء من الاستلام"
 }
diff --git a/share/locale/bg.json b/share/locale/bg.json
index 65d091d1..dc5b3cfa 100644
--- a/share/locale/bg.json
+++ b/share/locale/bg.json
@@ -10,7 +10,7 @@
     "not_a_readable_file": "{0:s) не е четаем файл.",
     "no_available_port": "Свободен порт не бе намерен, за да може onion услугата да бъде стартирана",
     "other_page_loaded": "Адресът е зареден",
-    "close_on_timeout": "Спряно, защото автоматично спиращият таймер приключи",
+    "close_on_autostop_timer": "Спряно, защото автоматично спиращият таймер приключи",
     "closing_automatically": "Спряно, защото свалянето приключи",
     "timeout_download_still_running": "Изчакване на свалянето да приключи",
     "timeout_upload_still_running": "Изчакване ъплоудът да приключи",
@@ -38,12 +38,12 @@
     "gui_choose_items": "Изберете",
     "gui_share_start_server": "Започнете споделянето",
     "gui_share_stop_server": "Спрете споделянето",
-    "gui_share_stop_server_shutdown_timeout": "Спрете споделянето ({} остават)",
-    "gui_share_stop_server_shutdown_timeout_tooltip": "Автоматично спиращият таймерът терминира в {}",
+    "gui_share_stop_server_autostop_timer": "Спрете споделянето ({} остават)",
+    "gui_share_stop_server_autostop_timer_tooltip": "Автоматично спиращият таймерът терминира в {}",
     "gui_receive_start_server": "Стартирайте получаващ режим",
     "gui_receive_stop_server": "Спрете получаващия режим",
-    "gui_receive_stop_server_shutdown_timeout": "Спрете получаващия режим ({} остават)",
-    "gui_receive_stop_server_shutdown_timeout_tooltip": "Автоматично спиращият таймер спира в {}",
+    "gui_receive_stop_server_autostop_timer": "Спрете получаващия режим ({} остават)",
+    "gui_receive_stop_server_autostop_timer_tooltip": "Автоматично спиращият таймер спира в {}",
     "gui_copy_url": "Копирайте адрес",
     "gui_copy_hidservauth": "Копирайте HidServAuth",
     "gui_downloads": "Свалете история",
@@ -105,8 +105,8 @@
     "gui_settings_button_save": "Запазване",
     "gui_settings_button_cancel": "Отказ",
     "gui_settings_button_help": "Помощ",
-    "gui_settings_shutdown_timeout_checkbox": "Използвайте автоматично спиращия таймер",
-    "gui_settings_shutdown_timeout": "Спри дела на:",
+    "gui_settings_autostop_timer_checkbox": "Използвайте автоматично спиращия таймер",
+    "gui_settings_autostop_timer": "Спри дела на:",
     "settings_error_unknown": "Не мога да се свържа с Тор контролера, защото Вашите настройки не правят смисъл.",
     "settings_error_automatic": "Не мога да се свържа с Тор контролера. Стартиран ли е Тор браузерът във фонов режим (достъпен от torproject. org)?",
     "settings_error_socket_port": "Не мога да се свържа с Тор контролера в {}:{}.",
@@ -132,8 +132,8 @@
     "gui_tor_connection_error_settings": "Опитайте се да промените в настройките как OnionShare се свързва с Тор.",
     "gui_tor_connection_canceled": "Не може да се установи връзка с Тор.\n\nУверете се, че имате връзка с интернтет, след което отново отворете OnionShare и пренастройте връзката с Тор.",
     "gui_tor_connection_lost": "Връзката с Тор е прекъсната.",
-    "gui_server_started_after_timeout": "Автоматично спиращият таймер спря преди сървърът да стартира.\nМоля направете нов дял.",
-    "gui_server_timeout_expired": "Автоматично спиращият таймер спря.\nМоля актуализирайте за да започнете споделяне.",
+    "gui_server_started_after_autostop_timer": "Автоматично спиращият таймер спря преди сървърът да стартира.\nМоля направете нов дял.",
+    "gui_server_autostop_timer_expired": "Автоматично спиращият таймер спря.\nМоля актуализирайте за да започнете споделяне.",
     "share_via_onionshare": "Споделете го чрез OnionShare",
     "gui_use_legacy_v2_onions_checkbox": "Използвайте стари адреси",
     "gui_save_private_key_checkbox": "Използвайте постоянни адреси (стари)",
diff --git a/share/locale/bn.json b/share/locale/bn.json
index 2ac65d47..590295c3 100644
--- a/share/locale/bn.json
+++ b/share/locale/bn.json
@@ -10,7 +10,7 @@
     "not_a_readable_file": "{0:s} ফাইলটি পড়া যাচ্ছে না।",
     "no_available_port": "Onion সার্ভিস চালু করার জন্য কোন পোর্ট পাওয়া যাচ্ছে না",
     "other_page_loaded": "এড্রেস লোড হয়েছে",
-    "close_on_timeout": "বন্ধ করা হয়েছে কারণ অটো-স্টপ টাইমার এর সময় শেষ",
+    "close_on_autostop_timer": "বন্ধ করা হয়েছে কারণ অটো-স্টপ টাইমার এর সময় শেষ",
     "closing_automatically": "ট্রান্সফার শেষ তাই থেমে যাওয়া হলো",
     "timeout_download_still_running": "",
     "timeout_upload_still_running": "",
@@ -38,12 +38,12 @@
     "gui_choose_items": "পছন্দ করুন",
     "gui_share_start_server": "শেয়ার করা শুরু করো",
     "gui_share_stop_server": "শেয়ার করা বন্ধ করো",
-    "gui_share_stop_server_shutdown_timeout": "শেয়ার করা বন্ধ করো ({} সেকেন্ড বাকি)",
-    "gui_share_stop_server_shutdown_timeout_tooltip": "টাইমার অনুযায়ী অটোমেটিক বন্ধ হবে {}-তে",
+    "gui_share_stop_server_autostop_timer": "শেয়ার করা বন্ধ করো ({} সেকেন্ড বাকি)",
+    "gui_share_stop_server_autostop_timer_tooltip": "টাইমার অনুযায়ী অটোমেটিক বন্ধ হবে {}-তে",
     "gui_receive_start_server": "প্রাপ্ত মোড আরম্ভ করুন",
     "gui_receive_stop_server": "প্রাপ্ত মোড বন্ধ করুন",
-    "gui_receive_stop_server_shutdown_timeout": "প্রাপ্ত মোড বন্ধ করুন ({}সে বাকি)",
-    "gui_receive_stop_server_shutdown_timeout_tooltip": "টাইমার অনুযায়ী অটোমেটিক বন্ধ হবে {}-তে",
+    "gui_receive_stop_server_autostop_timer": "প্রাপ্ত মোড বন্ধ করুন ({}সে বাকি)",
+    "gui_receive_stop_server_autostop_timer_tooltip": "টাইমার অনুযায়ী অটোমেটিক বন্ধ হবে {}-তে",
     "gui_copy_url": "এড্রেস কপি করো",
     "gui_copy_hidservauth": "HidServAuth কপি করো",
     "gui_downloads": "",
@@ -105,8 +105,8 @@
     "gui_settings_button_save": "সেভ",
     "gui_settings_button_cancel": "বাতিল",
     "gui_settings_button_help": "সাহায্য",
-    "gui_settings_shutdown_timeout_checkbox": "কানেকশন বন্ধ করার জন্য অটোমেটিক টাইমার ব্যবহার করো",
-    "gui_settings_shutdown_timeout": "শেয়ার বন্ধ করুন:",
+    "gui_settings_autostop_timer_checkbox": "কানেকশন বন্ধ করার জন্য অটোমেটিক টাইমার ব্যবহার করো",
+    "gui_settings_autostop_timer": "শেয়ার বন্ধ করুন:",
     "settings_error_unknown": "টর নিয়ন্ত্রকের সাথে সংযোগ করতে পারে না কারণ আপনার বিন্যাসনসমূহ বোধগম্য নয় ।",
     "settings_error_automatic": "টর নিয়ন্ত্রকের সাথে সংযোগ স্থাপন করা যায়নি । টর ব্রাউজার (torproject.org থেকে পাওয়া যায়) ব্রাকগ্রাউন চলমান?",
     "settings_error_socket_port": "{}: {} এ টর নিয়ন্ত্রকের সাথে সংযোগ করতে পারছি না ।",
@@ -132,8 +132,8 @@
     "gui_tor_connection_error_settings": "কিভাবে onionshare সেটিংসে টর নেটওয়ার্ক সংযোগ করে পরিবর্তন করতে চেষ্টা করুন ।",
     "gui_tor_connection_canceled": "টর-এ সংযোগ করা যায়নি ।\n\nআপনি ইন্টারনেটের সাথে সংযুক্ত আছেন কিনা তা নিশ্চিত করুন, তারপর onionshare পুনরায় খুলুন এবং টর এর সংযোগটি সেট আপ করুন ।",
     "gui_tor_connection_lost": "টর থেকে বিচ্ছিন্ন ।",
-    "gui_server_started_after_timeout": "সার্ভার শুরু হওয়ার আগেই অটো স্টপ টাইমার শেষ হয়ে যায় ।\n\nঅনুগ্রহ করে একটি  নতুন শেয়ার তৈরি করুন.",
-    "gui_server_timeout_expired": "অটো-স্টপ টাইমার ইতিমধ্যেই শেষ হয়ে গিয়েছে ।\n\nঅনুগ্রহ করে শেয়ারিং শুরু করতে এটি আপডেট করুন.",
+    "gui_server_started_after_autostop_timer": "সার্ভার শুরু হওয়ার আগেই অটো স্টপ টাইমার শেষ হয়ে যায় ।\n\nঅনুগ্রহ করে একটি  নতুন শেয়ার তৈরি করুন.",
+    "gui_server_autostop_timer_expired": "অটো-স্টপ টাইমার ইতিমধ্যেই শেষ হয়ে গিয়েছে ।\n\nঅনুগ্রহ করে শেয়ারিং শুরু করতে এটি আপডেট করুন.",
     "share_via_onionshare": "এটি OnionShare",
     "gui_use_legacy_v2_onions_checkbox": "লিগ্যাসি ঠিকানাগুলি ব্যবহার করুন",
     "gui_save_private_key_checkbox": "একটি অবিরাম ঠিকানা ব্যবহার করুন",
@@ -210,7 +210,7 @@
     "gui_all_modes_progress_starting": "{0:সে}, %p% (গণনা করা হচ্ছে)",
     "gui_all_modes_progress_eta": "{0:সে}, ইটিএ: {1: সে}, %p%",
     "gui_share_mode_no_files": "এখনও কোন ফাইল পাঠানো হয়নি",
-    "gui_share_mode_timeout_waiting": "প্রেরণ শেষ করার জন্য অপেক্ষা করছে",
+    "gui_share_mode_autostop_timer_waiting": "প্রেরণ শেষ করার জন্য অপেক্ষা করছে",
     "gui_receive_mode_no_files": "কোন ফাইল এখনও প্রাপ্ত হয়নি",
-    "gui_receive_mode_timeout_waiting": "প্রাপ্তির শেষ পর্যন্ত অপেক্ষা করছে"
+    "gui_receive_mode_autostop_timer_waiting": "প্রাপ্তির শেষ পর্যন্ত অপেক্ষা করছে"
 }
diff --git a/share/locale/ca.json b/share/locale/ca.json
index 65f12df4..83260905 100644
--- a/share/locale/ca.json
+++ b/share/locale/ca.json
@@ -10,7 +10,7 @@
     "not_a_readable_file": "{0:s} no és un arxiu llegible.",
     "no_available_port": "No s'ha pogut trobar un port disponible per començar el servei onion",
     "other_page_loaded": "Adreça carregada",
-    "close_on_timeout": "S'ha aturat perquè s'ha acabat el temps d'espera",
+    "close_on_autostop_timer": "S'ha aturat perquè s'ha acabat el temps d'espera",
     "closing_automatically": "S'ha aturat perquè ha acabat la transferència",
     "timeout_download_still_running": "S'està esperant que acabi la descàrrega",
     "large_filesize": "Compte: La transferència d'arxius molt grans podria trigar hores",
@@ -37,12 +37,12 @@
     "gui_choose_items": "Escull",
     "gui_share_start_server": "Comparteix",
     "gui_share_stop_server": "Deixa de compartir",
-    "gui_share_stop_server_shutdown_timeout": "Deixa de compartir (queden {}s)",
-    "gui_share_stop_server_shutdown_timeout_tooltip": "El temporitzador acaba a {}",
+    "gui_share_stop_server_autostop_timer": "Deixa de compartir (queden {}s)",
+    "gui_share_stop_server_autostop_timer_tooltip": "El temporitzador acaba a {}",
     "gui_receive_start_server": "Inicia en mode de recepció",
     "gui_receive_stop_server": "Atura el mode de recepció",
-    "gui_receive_stop_server_shutdown_timeout": "Atura el mode de recepció (queden {}s)",
-    "gui_receive_stop_server_shutdown_timeout_tooltip": "El temporitzador acaba a {}",
+    "gui_receive_stop_server_autostop_timer": "Atura el mode de recepció (queden {}s)",
+    "gui_receive_stop_server_autostop_timer_tooltip": "El temporitzador acaba a {}",
     "gui_copy_url": "Copia l'adreça",
     "gui_copy_hidservauth": "Copia el HidServAuth",
     "gui_downloads": "Historial de descàrregues",
@@ -104,8 +104,8 @@
     "gui_settings_button_save": "Desa",
     "gui_settings_button_cancel": "Canceŀla",
     "gui_settings_button_help": "Ajuda",
-    "gui_settings_shutdown_timeout_checkbox": "Posa un temporitzador d'aturada",
-    "gui_settings_shutdown_timeout": "Atura a:",
+    "gui_settings_autostop_timer_checkbox": "Posa un temporitzador d'aturada",
+    "gui_settings_autostop_timer": "Atura a:",
     "settings_error_unknown": "No s'ha pogut connectar a Tor perquè la configuració és inconsistent.",
     "settings_error_automatic": "No s'ha pogut connectar al controlador de Tor. Tens el navegador de Tor arrencat? (el pots descarregar a torproject.org)",
     "settings_error_socket_port": "No s'ha pogut establir la connexió al controlador de Tor a {}:{}.",
@@ -131,8 +131,8 @@
     "gui_tor_connection_error_settings": "Prova de canviar la configuració de com OnionShare es connecta a la xarxa Tor.",
     "gui_tor_connection_canceled": "No s'ha pogut establir la connexió amb la xarxa Tor.\n\nAssegura't que tens connexió a internet, torna a obrir OnionShare i prepara la connexió a Tor.",
     "gui_tor_connection_lost": "S'ha perdut la connexió amb Tor.",
-    "gui_server_started_after_timeout": "El temporitzador ha acabat abans que s'iniciés el servidor.\nTorna a compartir-ho.",
-    "gui_server_timeout_expired": "El temporitzador ja s'ha acabat.\nReinicia'l per a poder compartir.",
+    "gui_server_started_after_autostop_timer": "El temporitzador ha acabat abans que s'iniciés el servidor.\nTorna a compartir-ho.",
+    "gui_server_autostop_timer_expired": "El temporitzador ja s'ha acabat.\nReinicia'l per a poder compartir.",
     "share_via_onionshare": "Comparteix-ho amb OnionShare",
     "gui_use_legacy_v2_onions_checkbox": "Fes servir adreces amb un format antic",
     "gui_save_private_key_checkbox": "Fes servir una adreça persistent",
@@ -211,7 +211,7 @@
     "gui_all_modes_progress_starting": "{0:s}, %p% (s'està calculant)",
     "gui_all_modes_progress_eta": "{0:s}, Temps aproximat: {1:s}, %p%",
     "gui_share_mode_no_files": "Encara no s'han enviat fitxers",
-    "gui_share_mode_timeout_waiting": "S'està acabant d'enviar",
+    "gui_share_mode_autostop_timer_waiting": "S'està acabant d'enviar",
     "gui_receive_mode_no_files": "Encara no s'ha rebut res",
-    "gui_receive_mode_timeout_waiting": "S'està acabant de rebre"
+    "gui_receive_mode_autostop_timer_waiting": "S'està acabant de rebre"
 }
diff --git a/share/locale/cs.json b/share/locale/cs.json
index 3eb03198..0b30e162 100644
--- a/share/locale/cs.json
+++ b/share/locale/cs.json
@@ -74,9 +74,9 @@
     "systray_download_canceled_message": "Uživatel přerušil stahování souboru",
     "systray_upload_started_title": "Začalo nahrávání pomocí OnionShare",
     "systray_upload_started_message": "Někdo právě začal nahrávat soubory na váš počítač",
-    "gui_share_stop_server_shutdown_timeout": "Zastavit sdílení ({}s zbývá)",
+    "gui_share_stop_server_autostop_timer": "Zastavit sdílení ({}s zbývá)",
     "gui_receive_start_server": "Spustit mód přijímání",
     "gui_receive_stop_server": "Zastavit přijímání",
-    "gui_receive_stop_server_shutdown_timeout": "Zastavit mód přijímání ({}s zbývá)",
+    "gui_receive_stop_server_autostop_timer": "Zastavit mód přijímání ({}s zbývá)",
     "gui_copied_hidservauth_title": "Zkopírovaný HidServAuth token"
 }
diff --git a/share/locale/da.json b/share/locale/da.json
index 50e65951..375e20c8 100644
--- a/share/locale/da.json
+++ b/share/locale/da.json
@@ -8,7 +8,7 @@
     "not_a_readable_file": "{0:s} er ikke en læsbar fil.",
     "no_available_port": "Kunne ikke finde en tilgængelig port til at starte onion-tjenesten",
     "other_page_loaded": "Adresse indlæst",
-    "close_on_timeout": "Stoppede fordi timer med autostop løb ud",
+    "close_on_autostop_timer": "Stoppede fordi timer med autostop løb ud",
     "closing_automatically": "Stoppede fordi overførslen er færdig",
     "timeout_download_still_running": "Venter på at download skal blive færdig",
     "large_filesize": "Advarsel: Det kan tage timer at sende en stor deling",
@@ -83,7 +83,7 @@
     "gui_settings_button_save": "Gem",
     "gui_settings_button_cancel": "Annuller",
     "gui_settings_button_help": "Hjælp",
-    "gui_settings_shutdown_timeout": "Stop delingen ved:",
+    "gui_settings_autostop_timer": "Stop delingen ved:",
     "settings_saved": "Indstillinger gemt til {}",
     "settings_error_unknown": "Kan ikke oprette forbindelse til Tor-kontroller da dine indstillingerne ikke giver mening.",
     "settings_error_automatic": "Kunne ikke oprette forbindelse til Tor-kontrolleren. Kører Tor Browser (tilgængelige fra torproject.org) i baggrunden?",
@@ -108,8 +108,8 @@
     "gui_tor_connection_error_settings": "Prøv at ændre måden hvorpå OnionShare opretter forbindelse til Tor-netværket, i indstillingerne.",
     "gui_tor_connection_canceled": "Kunne ikke oprette forbindelse til Tor.\n\nSørg for at du har forbindelse til internettet, og åbn herefter OnionShare igen for at opsætte dens forbindelse til Tor.",
     "gui_tor_connection_lost": "Der er ikke oprettet forbindelse til Tor.",
-    "gui_server_started_after_timeout": "Timeren med autostop løb ud inden serveren startede.\nOpret venligst en ny deling.",
-    "gui_server_timeout_expired": "Timeren med autostop er allerede løbet ud.\nOpdater den venligst for at starte deling.",
+    "gui_server_started_after_autostop_timer": "Timeren med autostop løb ud inden serveren startede.\nOpret venligst en ny deling.",
+    "gui_server_autostop_timer_expired": "Timeren med autostop er allerede løbet ud.\nOpdater den venligst for at starte deling.",
     "share_via_onionshare": "Del via OnionShare",
     "gui_save_private_key_checkbox": "Brug en vedvarende adresse",
     "gui_copied_url_title": "Kopierede OnionShare-adresse",
@@ -117,7 +117,7 @@
     "gui_quit_title": "Klap lige hesten",
     "gui_settings_tor_bridges_meek_lite_azure_radio_option": "Brug indbyggede meek_lite (Azure) udskiftelige transporter",
     "gui_settings_tor_bridges_meek_lite_azure_radio_option_no_obfs4proxy": "Brug indbyggede meek_lite (Azure) udskiftelige transporter (kræver obfs4proxy)",
-    "gui_settings_shutdown_timeout_checkbox": "Brug timer med autostop",
+    "gui_settings_autostop_timer_checkbox": "Brug timer med autostop",
     "gui_url_label_persistent": "Delingen stopper ikke automatisk.<br><br>Hver efterfølgende deling bruger den samme adresse igen (hvis du vil bruge engangsadresser, så deaktivér \"Brug vedvarende adresse\", i indstillingerne).",
     "gui_url_label_stay_open": "Delingen stopper ikke automatisk.",
     "gui_url_label_onetime": "Delingen stopper efter den første download.",
@@ -131,17 +131,17 @@
     "systray_upload_started_title": "OnionShare-upload begyndte",
     "systray_upload_started_message": "En bruger begyndte at uploade filer til din computer",
     "help_receive": "Modtager aktier i stedet for at sende dem",
-    "gui_share_stop_server_shutdown_timeout": "Stop deling ({}s tilbage)",
+    "gui_share_stop_server_autostop_timer": "Stop deling ({}s tilbage)",
     "gui_receive_quit_warning": "Du er i færd med at modtage filer. Er du sikker på du ønsker at stoppe med at OnionShare?",
     "gui_settings_whats_this": "<a href='{0:s}'>Hvad er det?</a>",
     "gui_settings_general_label": "Generel opsætning",
     "gui_upload_in_progress": "Upload begyndte {}",
     "gui_download_in_progress": "Download begyndte {}",
-    "gui_share_stop_server_shutdown_timeout_tooltip": "Timer med autostop slutter ved {}",
+    "gui_share_stop_server_autostop_timer_tooltip": "Timer med autostop slutter ved {}",
     "gui_receive_start_server": "Start modtagetilstand",
     "gui_receive_stop_server": "Stop modtagetilstand",
-    "gui_receive_stop_server_shutdown_timeout": "Stop modtagetilstand ({}s tilbage)",
-    "gui_receive_stop_server_shutdown_timeout_tooltip": "Timer med autostop slutter ved {}",
+    "gui_receive_stop_server_autostop_timer": "Stop modtagetilstand ({}s tilbage)",
+    "gui_receive_stop_server_autostop_timer_tooltip": "Timer med autostop slutter ved {}",
     "gui_no_downloads": "Ingen downloads endnu",
     "error_tor_protocol_error_unknown": "Der opstod en ukendt fejl med Tor",
     "error_invalid_private_key": "Den private nøgletype understøttes ikke",
@@ -211,9 +211,9 @@
     "gui_all_modes_progress_starting": "{0:s}, %p% (udregner)",
     "gui_all_modes_progress_eta": "{0:s}, anslået ankomsttidspunkt: {1:s}, %p%",
     "gui_share_mode_no_files": "Der er endnu ikke sendt nogen filer",
-    "gui_share_mode_timeout_waiting": "Venter på at blive færdig med at sende",
+    "gui_share_mode_autostop_timer_waiting": "Venter på at blive færdig med at sende",
     "gui_receive_mode_no_files": "Der er endnu ikke modtaget nogen filer",
-    "gui_receive_mode_timeout_waiting": "Venter på at blive færdig med at modtage",
+    "gui_receive_mode_autostop_timer_waiting": "Venter på at blive færdig med at modtage",
     "gui_all_modes_transfer_canceled_range": "Annullerede {} - {}",
     "gui_all_modes_transfer_canceled": "Annullerede {}",
     "gui_settings_onion_label": "Onion-indstillinger"
diff --git a/share/locale/de.json b/share/locale/de.json
index dbc00898..88f85065 100644
--- a/share/locale/de.json
+++ b/share/locale/de.json
@@ -27,7 +27,7 @@
     "gui_settings_button_save": "Speichern",
     "gui_settings_button_cancel": "Abbrechen",
     "gui_settings_button_help": "Hilfe",
-    "gui_settings_shutdown_timeout": "Stoppe den Server bei:",
+    "gui_settings_autostop_timer": "Stoppe den Server bei:",
     "systray_download_started_title": "OnionShare Download begonnen",
     "systray_download_started_message": "Ein Nutzer hat begonnen, deine Dateien herunterzuladen",
     "systray_download_completed_title": "OnionShare Download beendet",
@@ -50,13 +50,13 @@
     "give_this_url_receive_stealth": "Gib diese URL und die HidServAuth-Zeile an den Sender:",
     "not_a_readable_file": "{0:s} kann nicht gelesen werden.",
     "no_available_port": "Es konnte kein freier Port gefunden werden, um den Onionservice zu starten",
-    "close_on_timeout": "Angehalten da der auto-stop Timer abgelaufen ist",
+    "close_on_autostop_timer": "Angehalten da der auto-stop Timer abgelaufen ist",
     "systray_upload_started_title": "OnionShare Upload wurde gestartet",
     "systray_upload_started_message": "Ein Benutzer hat begonnen, Dateien auf deinen Computer hochzuladen",
     "help_autostop_timer": "Den Server nach einer bestimmten Zeit anhalten (in Sekunden)",
     "help_receive": "Empfange Dateien anstatt sie zu senden",
-    "gui_share_stop_server_shutdown_timeout": "Server stoppen (läuft noch {} Sekunden)",
-    "gui_share_stop_server_shutdown_timeout_tooltip": "Zeit läuft in {} Sekunden ab",
+    "gui_share_stop_server_autostop_timer": "Server stoppen (läuft noch {} Sekunden)",
+    "gui_share_stop_server_autostop_timer_tooltip": "Zeit läuft in {} Sekunden ab",
     "gui_settings_connection_type_control_port_option": "Verbinde über den control port",
     "gui_settings_connection_type_socket_file_option": "Verbinde über ein socket file",
     "gui_settings_control_port_label": "Control port",
@@ -70,7 +70,7 @@
     "gui_settings_tor_bridges_meek_lite_azure_radio_option_no_obfs4proxy": "Benutze eingebaute meek_lite (Azure) pluggable transports (benötigt obfs4proxy)",
     "gui_settings_tor_bridges_custom_radio_option": "Benutze benutzerdefinierte bridges",
     "gui_settings_tor_bridges_custom_label": "Bridges findest du unter  <a href=\"https://bridges.torproject.org/options\">https://bridges.torproject.org</a>",
-    "gui_settings_shutdown_timeout_checkbox": "Stoppe nach einer bestimmten Zeit",
+    "gui_settings_autostop_timer_checkbox": "Stoppe nach einer bestimmten Zeit",
     "settings_error_auth": "Mit {}:{} verbinden aber nicht authentifiziert. Eventuell handelt es sich nicht um einen Tor controller?",
     "settings_error_missing_password": "Mit dem Tor controller verbunden, aber er benötigt ein Passwort zur Authentifizierung.",
     "connecting_to_tor": "Verbinde mit dem Tornetzwerk",
@@ -79,8 +79,8 @@
     "help_stealth": "Nutze Klientauthorisierung (fortgeschritten)",
     "gui_receive_start_server": "Starte den Empfangsmodus",
     "gui_receive_stop_server": "Stoppe den Empfangsmodus",
-    "gui_receive_stop_server_shutdown_timeout": "Stoppe den Empfängermodus (stoppt automatisch in {} Sekunden)",
-    "gui_receive_stop_server_shutdown_timeout_tooltip": "Zeit läuft in {} ab",
+    "gui_receive_stop_server_autostop_timer": "Stoppe den Empfängermodus (stoppt automatisch in {} Sekunden)",
+    "gui_receive_stop_server_autostop_timer_tooltip": "Zeit läuft in {} ab",
     "gui_no_downloads": "Bisher keine Downloads",
     "gui_copied_url_title": "OnionShare-Adresse kopiert",
     "gui_copied_hidservauth": "HidServAuth-Zeile in die Zwischenablage kopiert",
@@ -174,8 +174,8 @@
     "gui_settings_stealth_hidservauth_string": "Da dein privater Schlüssel jetzt gespeichert wurde um ihn später erneut zu nutzen, kannst du jetzt\nklicken um deinen HidServAuth zu kopieren.",
     "gui_settings_connection_type_bundled_option": "Die integrierte Tor version von OnionShare nutzen",
     "settings_error_socket_file": "Kann nicht mittels des Tor Controller Socket {} verbinden.",
-    "gui_server_started_after_timeout": "Die Zeit ist abgelaufen bevor der Server gestartet werden konnte.\nBitte erneut etwas teilen.",
-    "gui_server_timeout_expired": "Der Timer ist bereits abgelaufen.\nBearbeite diesen um das Teilen zu starten.",
+    "gui_server_started_after_autostop_timer": "Die Zeit ist abgelaufen bevor der Server gestartet werden konnte.\nBitte erneut etwas teilen.",
+    "gui_server_autostop_timer_expired": "Der Timer ist bereits abgelaufen.\nBearbeite diesen um das Teilen zu starten.",
     "gui_status_indicator_share_stopped": "Bereit zum teilen",
     "history_in_progress_tooltip": "{} läuft",
     "receive_mode_upload_starting": "Hochladen von insgesamt {} beginnt",
@@ -209,9 +209,9 @@
     "gui_all_modes_transfer_canceled": "{} abgebrochen",
     "gui_all_modes_progress_starting": "{0:s}, %p% (berechne)",
     "gui_share_mode_no_files": "Bisher keine Dateien versendet",
-    "gui_share_mode_timeout_waiting": "Warte auf Abschluss der Sendung",
+    "gui_share_mode_autostop_timer_waiting": "Warte auf Abschluss der Sendung",
     "gui_receive_mode_no_files": "Bisher keine Dateien empfangen",
-    "gui_receive_mode_timeout_waiting": "Warte auf Abschluss des Empfangs",
+    "gui_receive_mode_autostop_timer_waiting": "Warte auf Abschluss des Empfangs",
     "gui_all_modes_progress_eta": "{0:s}, ETA: {1:s}, %p%",
     "gui_all_modes_progress_complete": "%p%, {0:s} vergangen."
 }
diff --git a/share/locale/el.json b/share/locale/el.json
index e4e60b26..0c517d4a 100644
--- a/share/locale/el.json
+++ b/share/locale/el.json
@@ -10,7 +10,7 @@
     "not_a_readable_file": "Το {0:s} δεν είναι αναγνώσιμο αρχείο.",
     "no_available_port": "Δεν βρέθηκε διαθέσιμη θύρα για να ξεκινήσει η υπηρεσία onion",
     "other_page_loaded": "Η διεύθυνση φορτώθηκε",
-    "close_on_timeout": "Τερματίστηκε γιατί το χρονόμετρο τερματισμού έφτασε στο τέλος",
+    "close_on_autostop_timer": "Τερματίστηκε γιατί το χρονόμετρο τερματισμού έφτασε στο τέλος",
     "closing_automatically": "Τερματίστηκε επειδή η λήψη ολοκληρώθηκε",
     "timeout_download_still_running": "Αναμονή ολοκλήρωσης της λήψης",
     "large_filesize": "Προειδοποίηση: Η αποστολή μεγάλου όγκου δεδομένων μπορεί να διαρκέσει ώρες",
@@ -37,12 +37,12 @@
     "gui_choose_items": "Επιλογή",
     "gui_share_start_server": "Εκκίνηση μοιράσματος",
     "gui_share_stop_server": "Τερματισμός μοιράσματος",
-    "gui_share_stop_server_shutdown_timeout": "Τερματισμός μοιράσματος (απομένουν {}\")",
-    "gui_share_stop_server_shutdown_timeout_tooltip": "Το χρονόμετρο αυτόματου τερματισμού τελειώνει σε {}",
+    "gui_share_stop_server_autostop_timer": "Τερματισμός μοιράσματος (απομένουν {}\")",
+    "gui_share_stop_server_autostop_timer_tooltip": "Το χρονόμετρο αυτόματου τερματισμού τελειώνει σε {}",
     "gui_receive_start_server": "Εκκίνηση κατάστασης λήψης",
     "gui_receive_stop_server": "Τερματισμός κατάστασης λήψης",
-    "gui_receive_stop_server_shutdown_timeout": "Τερματισμός κατάστασης λήψης (υπολοίπονται {}\")",
-    "gui_receive_stop_server_shutdown_timeout_tooltip": "Το χρονόμετρο αυτόματου τερματισμού τελειώνει σε {}",
+    "gui_receive_stop_server_autostop_timer": "Τερματισμός κατάστασης λήψης (υπολοίπονται {}\")",
+    "gui_receive_stop_server_autostop_timer_tooltip": "Το χρονόμετρο αυτόματου τερματισμού τελειώνει σε {}",
     "gui_copy_url": "Αντιγραφή διεύθυνσης",
     "gui_copy_hidservauth": "Αντιγραφή HidServAuth",
     "gui_downloads": "Ιστορικό Λήψεων",
@@ -104,8 +104,8 @@
     "gui_settings_button_save": "Αποθήκευση",
     "gui_settings_button_cancel": "Ακύρωση",
     "gui_settings_button_help": "Βοήθεια",
-    "gui_settings_shutdown_timeout_checkbox": "Χρήση χρονομέτρου αυτόματου τερματισμού",
-    "gui_settings_shutdown_timeout": "Τερματισμός της κοινοποίησης στα:",
+    "gui_settings_autostop_timer_checkbox": "Χρήση χρονομέτρου αυτόματου τερματισμού",
+    "gui_settings_autostop_timer": "Τερματισμός της κοινοποίησης στα:",
     "settings_error_unknown": "Αδύνατη η σύνδεση του ελέγχου Tor, καθώς οι ρυθμίσεις σας δεν έχουν κανένα νόημα.",
     "settings_error_automatic": "Είναι αδύνατη η σύνδεση στον έλεγχο του Tor. Λειτουργεί ο Tor Browser (διαθέσιμος στο torproject.org) στο παρασκήνιο?",
     "settings_error_socket_port": "Αδύνατη η σύνδεση στον έλεγχο Tor στις {}:{}.",
@@ -131,8 +131,8 @@
     "gui_tor_connection_error_settings": "Προσπαθήστε να αλλάξετε τον τρόπο σύνδεσης του OnionShare,  με το δίκτυο Tor, από τις ρυθμίσεις.",
     "gui_tor_connection_canceled": "Δεν μπόρεσε να γίνει σύνδεση με Tor.\n\nΕλέγξτε ότι είστε συνδεδεμένοι στο Διαδίκτυο, επανεκινήστε το OnionShare και ρυθμίστε την σύνδεση με το Tor.",
     "gui_tor_connection_lost": "Εγινε αποσύνδεση απο το Tor.",
-    "gui_server_started_after_timeout": "Η λειτουργία auto-stop τερματίστηκε πριν την εκκίνηση διακομιστή.\nΠαρακαλώ κάντε εναν νέο διαμοιρασμό.",
-    "gui_server_timeout_expired": "Η λειτουργία auto-stop ήδη τερματίστηκε.\nΕνημερώστε την για να ξεκινήσετε τον διαμοιρασμό.",
+    "gui_server_started_after_autostop_timer": "Η λειτουργία auto-stop τερματίστηκε πριν την εκκίνηση διακομιστή.\nΠαρακαλώ κάντε εναν νέο διαμοιρασμό.",
+    "gui_server_autostop_timer_expired": "Η λειτουργία auto-stop ήδη τερματίστηκε.\nΕνημερώστε την για να ξεκινήσετε τον διαμοιρασμό.",
     "share_via_onionshare": "Κάντε το OnionShare",
     "gui_use_legacy_v2_onions_checkbox": "Χρηση \"παραδοσιακών\" διευθύνσεων",
     "gui_save_private_key_checkbox": "Χρήση μόνιμης διεύθυνσης",
@@ -208,9 +208,9 @@
     "gui_all_modes_progress_starting": "{0:s}, %p% (γίνεται υπολογισμός)",
     "gui_all_modes_progress_eta": "{0:s}, εκτίμηση: {1:s}, %p%",
     "gui_share_mode_no_files": "Δεν Στάλθηκαν Αρχεία Ακόμα",
-    "gui_share_mode_timeout_waiting": "Αναμένοντας την ολοκλήρωση αποστολής",
+    "gui_share_mode_autostop_timer_waiting": "Αναμένοντας την ολοκλήρωση αποστολής",
     "gui_receive_mode_no_files": "Δεν Εγινε Καμμία Λήψη Αρχείων Ακόμα",
-    "gui_receive_mode_timeout_waiting": "Αναμένοντας την ολοκλήρωση της λήψης",
+    "gui_receive_mode_autostop_timer_waiting": "Αναμένοντας την ολοκλήρωση της λήψης",
     "gui_settings_onion_label": "Ρυθμίσεις Onion",
     "gui_all_modes_transfer_canceled_range": "Ακυρώθηκε {} - {}",
     "gui_all_modes_transfer_canceled": "Ακυρώθηκε {}"
diff --git a/share/locale/en.json b/share/locale/en.json
index 973028c8..1dad3c36 100644
--- a/share/locale/en.json
+++ b/share/locale/en.json
@@ -15,7 +15,7 @@
     "not_a_readable_file": "{0:s} is not a readable file.",
     "no_available_port": "Could not find an available port to start the onion service",
     "other_page_loaded": "Address loaded",
-    "close_on_timeout": "Stopped because auto-stop timer ran out",
+    "close_on_autostop_timer": "Stopped because auto-stop timer ran out",
     "closing_automatically": "Stopped because transfer is complete",
     "large_filesize": "Warning: Sending a large share could take hours",
     "help_local_only": "Don't use Tor (only for development)",
@@ -36,12 +36,12 @@
     "gui_choose_items": "Choose",
     "gui_share_start_server": "Start sharing",
     "gui_share_stop_server": "Stop sharing",
-    "gui_share_stop_server_shutdown_timeout": "Stop Sharing ({})",
-    "gui_stop_server_shutdown_timeout_tooltip": "Auto-stop timer ends at {}",
+    "gui_share_stop_server_autostop_timer": "Stop Sharing ({})",
+    "gui_stop_server_autostop_timer_tooltip": "Auto-stop timer ends at {}",
     "gui_start_server_startup_timer_tooltip": "Auto-start timer ends at {}",
     "gui_receive_start_server": "Start Receive Mode",
     "gui_receive_stop_server": "Stop Receive Mode",
-    "gui_receive_stop_server_shutdown_timeout": "Stop Receive Mode ({}s remaining)",
+    "gui_receive_stop_server_autostop_timer": "Stop Receive Mode ({}s remaining)",
     "gui_copy_url": "Copy Address",
     "gui_copy_hidservauth": "Copy HidServAuth",
     "gui_canceled": "Canceled",
@@ -100,8 +100,8 @@
     "gui_settings_button_save": "Save",
     "gui_settings_button_cancel": "Cancel",
     "gui_settings_button_help": "Help",
-    "gui_settings_shutdown_timeout_checkbox": "Use auto-stop timer",
-    "gui_settings_shutdown_timeout": "Stop the share at:",
+    "gui_settings_autostop_timer_checkbox": "Use auto-stop timer",
+    "gui_settings_autostop_timer": "Stop the share at:",
     "gui_settings_startup_timer_checkbox": "Use auto-start timer",
     "gui_settings_startup_timer": "Start the share at:",
     "settings_error_unknown": "Can't connect to Tor controller because your settings don't make sense.",
@@ -129,10 +129,10 @@
     "gui_tor_connection_error_settings": "Try changing how OnionShare connects to the Tor network in the settings.",
     "gui_tor_connection_canceled": "Could not connect to Tor.\n\nEnsure you are connected to the Internet, then re-open OnionShare and set up its connection to Tor.",
     "gui_tor_connection_lost": "Disconnected from Tor.",
-    "gui_server_started_after_timeout": "The auto-stop timer ran out before the server started. Please make a new share.",
-    "gui_server_timeout_expired": "The auto-stop timer already ran out. Please update it to start sharing.",
+    "gui_server_started_after_autostop_timer": "The auto-stop timer ran out before the server started. Please make a new share.",
+    "gui_server_autostop_timer_expired": "The auto-stop timer already ran out. Please update it to start sharing.",
     "gui_server_startup_timer_expired": "The scheduled time has already passed. Please update it to start sharing.",
-    "gui_timeout_cant_be_earlier_than_startup": "The auto-stop time can't be the same or earlier than the start-up time. Please update it to start sharing.",
+    "gui_autostop_timer_cant_be_earlier_than_startup": "The auto-stop time can't be the same or earlier than the start-up time. Please update it to start sharing.",
     "share_via_onionshare": "OnionShare it",
     "gui_connect_to_tor_for_onion_settings": "Connect to Tor to see onion service settings",
     "gui_use_legacy_v2_onions_checkbox": "Use legacy addresses",
@@ -192,9 +192,9 @@
     "gui_all_modes_progress_starting": "{0:s}, %p% (calculating)",
     "gui_all_modes_progress_eta": "{0:s}, ETA: {1:s}, %p%",
     "gui_share_mode_no_files": "No Files Sent Yet",
-    "gui_share_mode_timeout_waiting": "Waiting to finish sending",
+    "gui_share_mode_autostop_timer_waiting": "Waiting to finish sending",
     "gui_receive_mode_no_files": "No Files Received Yet",
-    "gui_receive_mode_timeout_waiting": "Waiting to finish receiving",
+    "gui_receive_mode_autostop_timer_waiting": "Waiting to finish receiving",
     "waiting_for_scheduled_time": "Waiting for the scheduled time before starting...",
     "days_first_letter": "d",
     "hours_first_letter": "h",
diff --git a/share/locale/es.json b/share/locale/es.json
index 4bb5b839..18426a20 100644
--- a/share/locale/es.json
+++ b/share/locale/es.json
@@ -21,7 +21,7 @@
     "config_onion_service": "Configurando el servicio cebolla en el puerto {0:d}.",
     "give_this_url_stealth": "Dale esta dirección y la línea de HidServAuth a la persona a la que le estás enviando el archivo:",
     "no_available_port": "No se pudo iniciar el servicio cebolla porque no había puerto disponible",
-    "close_on_timeout": "Parado porque el temporizador expiró",
+    "close_on_autostop_timer": "Parado porque el temporizador expiró",
     "timeout_download_still_running": "Esperando a que se complete la descarga",
     "large_filesize": "Advertencia: Enviar un archivo tan grande podría llevar horas",
     "help_autostop_timer": "Dejar de compartir después de una determinada cantidad de segundos",
@@ -60,12 +60,12 @@
     "systray_upload_started_title": "Subida OnionShare Iniciada",
     "systray_upload_started_message": "Un usuario comenzó a subir archivos a tu computadora",
     "help_receive": "Recibir recursos compartidos en lugar de enviarlos",
-    "gui_share_stop_server_shutdown_timeout": "Dejar de Compartir ({}s restantes)",
-    "gui_share_stop_server_shutdown_timeout_tooltip": "El temporizador de parada automática termina en {}",
+    "gui_share_stop_server_autostop_timer": "Dejar de Compartir ({}s restantes)",
+    "gui_share_stop_server_autostop_timer_tooltip": "El temporizador de parada automática termina en {}",
     "gui_receive_start_server": "Iniciar el modo de recepción",
     "gui_receive_stop_server": "Detener el modo de recepción",
-    "gui_receive_stop_server_shutdown_timeout": "Detener el modo de recepción ({}s restantes)",
-    "gui_receive_stop_server_shutdown_timeout_tooltip": "El temporizador de parada automática termina en {}",
+    "gui_receive_stop_server_autostop_timer": "Detener el modo de recepción ({}s restantes)",
+    "gui_receive_stop_server_autostop_timer_tooltip": "El temporizador de parada automática termina en {}",
     "gui_copy_hidservauth": "Copiar HidServAuth",
     "gui_no_downloads": "Ninguna Descarga Todavía",
     "gui_canceled": "Cancelado",
@@ -95,8 +95,8 @@
     "gui_tor_connection_error_settings": "Intenta cambiando la forma en que OnionShare se conecta a la red Tor en tu configuración.",
     "gui_tor_connection_canceled": "No se pudo conectar con Tor.\n\nAsegúrate de estar conectado a Internet, luego vuelve a abrir OnionShare y configurar tu conexión a Tor.",
     "gui_tor_connection_lost": "Desconectado de Tor.",
-    "gui_server_started_after_timeout": "El temporizador de parada automática se agotó antes de que se iniciara el servidor.\nPor favor crea una nueva conexión compartida.",
-    "gui_server_timeout_expired": "El temporizador de parada automática ya se ha agotado.\nPor favor, actualízalo para comenzar a compartir.",
+    "gui_server_started_after_autostop_timer": "El temporizador de parada automática se agotó antes de que se iniciara el servidor.\nPor favor crea una nueva conexión compartida.",
+    "gui_server_autostop_timer_expired": "El temporizador de parada automática ya se ha agotado.\nPor favor, actualízalo para comenzar a compartir.",
     "share_via_onionshare": "Compártelo con OnionShare",
     "gui_use_legacy_v2_onions_checkbox": "Usar direcciones antiguas",
     "gui_save_private_key_checkbox": "Usar una dirección persistente",
@@ -155,8 +155,8 @@
     "gui_settings_button_save": "Guardar",
     "gui_settings_button_cancel": "Cancelar",
     "gui_settings_button_help": "Ayuda",
-    "gui_settings_shutdown_timeout_checkbox": "Usar temporizador de parada automática",
-    "gui_settings_shutdown_timeout": "Detener carpeta compartida en:",
+    "gui_settings_autostop_timer_checkbox": "Usar temporizador de parada automática",
+    "gui_settings_autostop_timer": "Detener carpeta compartida en:",
     "history_in_progress_tooltip": "{} en progreso",
     "history_completed_tooltip": "{} completado",
     "error_cannot_create_downloads_dir": "No se ha podido crear la carpeta en modo de recepción: {}",
@@ -212,9 +212,9 @@
     "gui_all_modes_progress_starting": "{0:s}, %p% (calculando)",
     "gui_all_modes_progress_eta": "{0:s}, TEA: {1:s}, %p%",
     "gui_share_mode_no_files": "No se enviaron archivos todavía",
-    "gui_share_mode_timeout_waiting": "Esperando a que termine el envío",
+    "gui_share_mode_autostop_timer_waiting": "Esperando a que termine el envío",
     "gui_receive_mode_no_files": "No se recibieron archivos todavía",
-    "gui_receive_mode_timeout_waiting": "Esperando a que termine la recepción",
+    "gui_receive_mode_autostop_timer_waiting": "Esperando a que termine la recepción",
     "gui_all_modes_transfer_canceled_range": "Cancelado {} - {}",
     "gui_all_modes_transfer_canceled": "Cancelado {}",
     "gui_settings_onion_label": "Configuración de Onion"
diff --git a/share/locale/fa.json b/share/locale/fa.json
index 302bc067..5f389610 100644
--- a/share/locale/fa.json
+++ b/share/locale/fa.json
@@ -10,7 +10,7 @@
     "not_a_readable_file": "{0:s} قابل خواندن نمی باشد.",
     "no_available_port": "پورت قابل استفاده برای شروع سرویس onion پیدا نشد",
     "other_page_loaded": "آدرس بارگذاری شد",
-    "close_on_timeout": "متوقف شد چون تایمر توقف خودکار به پایان رسید",
+    "close_on_autostop_timer": "متوقف شد چون تایمر توقف خودکار به پایان رسید",
     "closing_automatically": "متوقف شد چون انتقال انجام شد",
     "timeout_download_still_running": "انتظار برای تکمیل دانلود",
     "large_filesize": "هشدار: یک اشتراک گذاری بزرگ ممکن است ساعت ها طول بکشد",
@@ -37,12 +37,12 @@
     "gui_choose_items": "انتخاب",
     "gui_share_start_server": "شروع اشتراک گذاری",
     "gui_share_stop_server": "توقف اشتراک گذاری",
-    "gui_share_stop_server_shutdown_timeout": "توقف اشتراک گذاری ({} ثانیه باقیمانده)",
-    "gui_share_stop_server_shutdown_timeout_tooltip": "تایمر توقف خودکار در {} متوقف می شود",
+    "gui_share_stop_server_autostop_timer": "توقف اشتراک گذاری ({} ثانیه باقیمانده)",
+    "gui_share_stop_server_autostop_timer_tooltip": "تایمر توقف خودکار در {} متوقف می شود",
     "gui_receive_start_server": "شروع حالت دریافت",
     "gui_receive_stop_server": "توقف حالت دریافت",
-    "gui_receive_stop_server_shutdown_timeout": "توقف حالت دریافت ({} ثانیه باقیمانده)",
-    "gui_receive_stop_server_shutdown_timeout_tooltip": "تایمر توقف خودکار در {} به پایان می رسد",
+    "gui_receive_stop_server_autostop_timer": "توقف حالت دریافت ({} ثانیه باقیمانده)",
+    "gui_receive_stop_server_autostop_timer_tooltip": "تایمر توقف خودکار در {} به پایان می رسد",
     "gui_copy_url": "کپی آدرس",
     "gui_copy_hidservauth": "کپی HidServAuth",
     "gui_downloads": "دانلود تاریخچه",
@@ -104,8 +104,8 @@
     "gui_settings_button_save": "ذخیره",
     "gui_settings_button_cancel": "لغو",
     "gui_settings_button_help": "راهنما",
-    "gui_settings_shutdown_timeout_checkbox": "استفاده از تایمر توقف خودکار",
-    "gui_settings_shutdown_timeout": "توقف اشتراک در:",
+    "gui_settings_autostop_timer_checkbox": "استفاده از تایمر توقف خودکار",
+    "gui_settings_autostop_timer": "توقف اشتراک در:",
     "settings_error_unknown": "ناتوانی در اتصال به کنترل کننده Tor بدلیل نامفهوم بودن تنظیمات.",
     "settings_error_automatic": "ناتوانی در اتصال به کنترل کننده Tor. آیا مرورگر Tor (در دسترس از طریق torproject.org) در پس زمینه در حال اجراست؟",
     "settings_error_socket_port": "ناتوانی در اتصال به کنترل کننده Tor در {}:{}.",
@@ -131,8 +131,8 @@
     "gui_tor_connection_error_settings": "تغییر نحوه اتصال OnionShare به شبکه Tor در تنظیمات.",
     "gui_tor_connection_canceled": "اتصال به Tor برقرار نشد.\n\nمطمئن شوید که به اینترنت متصل هستید، سپس OnionShare را دوباره باز کرده و اتصال آن را به Tor دوباره برقرار کنید.",
     "gui_tor_connection_lost": "اتصال با Tor قطع شده است.",
-    "gui_server_started_after_timeout": "تایمر توقف خودکار قبل از آغاز سرور به پایان رسید.\nلطفا یک اشتراک جدید درست کنید.",
-    "gui_server_timeout_expired": "تایمر توقف خودکار به پایان رسید.\nلطفا برای آغاز اشتراک گذاری آن را به روز رسانی کنید.",
+    "gui_server_started_after_autostop_timer": "تایمر توقف خودکار قبل از آغاز سرور به پایان رسید.\nلطفا یک اشتراک جدید درست کنید.",
+    "gui_server_autostop_timer_expired": "تایمر توقف خودکار به پایان رسید.\nلطفا برای آغاز اشتراک گذاری آن را به روز رسانی کنید.",
     "share_via_onionshare": "OnionShare کنید",
     "gui_use_legacy_v2_onions_checkbox": "استفاده از آدرس های بازمانده",
     "gui_save_private_key_checkbox": "استفاده از یک آدرس پایا",
@@ -208,9 +208,9 @@
     "gui_all_modes_progress_starting": "{0:s}, %p% (در حال محاسبه)",
     "gui_all_modes_progress_eta": "{0:s}، تخمین: {1:s}, %p%",
     "gui_share_mode_no_files": "هیچ فایلی هنوز ارسال نشده است",
-    "gui_share_mode_timeout_waiting": "انتظار برای به پایان رسیدن ارسال",
+    "gui_share_mode_autostop_timer_waiting": "انتظار برای به پایان رسیدن ارسال",
     "gui_receive_mode_no_files": "هیچ فایلی هنوز دریافت نشده است",
-    "gui_receive_mode_timeout_waiting": "انتظار برای به پایان رسیدن دریافت",
+    "gui_receive_mode_autostop_timer_waiting": "انتظار برای به پایان رسیدن دریافت",
     "gui_all_modes_transfer_canceled_range": "{} - {} لغو شد",
     "gui_all_modes_transfer_canceled": "{} لغو شد"
 }
diff --git a/share/locale/fi.json b/share/locale/fi.json
index ce2a7eb1..5965d78a 100644
--- a/share/locale/fi.json
+++ b/share/locale/fi.json
@@ -28,19 +28,19 @@
     "give_this_url_receive_stealth": "Anna tämä osoite ja HidServAuth lähettäjälle:",
     "not_a_readable_file": "{0:s} ei ole luettava tiedosto.",
     "no_available_port": "Vapaata porttia onion palvelulle ei löydetty",
-    "close_on_timeout": "Pysäytetty koska auto-stop ajastin loppui",
-    "help_shutdown_timeout": "Lopeta jakaminen annetun sekunnin kuluttua",
+    "close_on_autostop_timer": "Pysäytetty koska auto-stop ajastin loppui",
+    "help_autostop_timer": "Lopeta jakaminen annetun sekunnin kuluttua",
     "help_stealth": "Käytä asiakasvaltuutusta (edistynyt)",
     "help_receive": "Vastaanota osia niiden lähettämisen sijaan",
     "help_config": "Mukautettu JSON-määritystiedoston sijainti (valinnainen)",
     "gui_add_files": "Lisää tiedostoja",
     "gui_add_folder": "Lisää kansio",
-    "gui_share_stop_server_shutdown_timeout": "Lopeta jakaminen({}s jäljellä)",
-    "gui_share_stop_server_shutdown_timeout_tooltip": "Auto-stop ajastin loppuu {} jälkeen",
+    "gui_share_stop_server_autostop_timer": "Lopeta jakaminen({}s jäljellä)",
+    "gui_share_stop_server_autostop_timer_tooltip": "Auto-stop ajastin loppuu {} jälkeen",
     "gui_receive_start_server": "Aloita vastaanotto tila",
     "gui_receive_stop_server": "Lopeta vastaanotto tila",
-    "gui_receive_stop_server_shutdown_timeout": "Lopeta vastaanotto tila ({}s jäljellä)",
-    "gui_receive_stop_server_shutdown_timeout_tooltip": "Auto-stop ajastin loppuu kello {}",
+    "gui_receive_stop_server_autostop_timer": "Lopeta vastaanotto tila ({}s jäljellä)",
+    "gui_receive_stop_server_autostop_timer_tooltip": "Auto-stop ajastin loppuu kello {}",
     "gui_copy_hidservauth": "Kopioi HidServAuth",
     "gui_copied_url_title": "Kopioi OnionShare osoite",
     "gui_copied_hidservauth_title": "HidServAuth kopioitu",
@@ -93,8 +93,8 @@
     "gui_settings_button_save": "Tallenna",
     "gui_settings_button_cancel": "Peruuttaa",
     "gui_settings_button_help": "Apua",
-    "gui_settings_shutdown_timeout_checkbox": "Käytä auto-stop ajastinta",
-    "gui_settings_shutdown_timeout": "Lopeta jakaminen kello:",
+    "gui_settings_autostop_timer_checkbox": "Käytä auto-stop ajastinta",
+    "gui_settings_autostop_timer": "Lopeta jakaminen kello:",
     "settings_error_unknown": "Ei voi muodostaa yhteyttä Tor-ohjaimeen, koska asetuksesi eivät ole järkeviä.",
     "settings_error_automatic": "Tor-ohjaimeen ei voitu muodostaa yhteyttä. Onko Tor Browser (saatavilla osoitteesta torproject.org) avoimena taustalla?",
     "settings_error_socket_port": "Ei voi muodostaa yhteyttä Tor-ohjaimeen: {}:{}.",
@@ -120,8 +120,8 @@
     "gui_tor_connection_error_settings": "Yritä muuttaa miten OnionShare yhdistää Tor-verkkoon asetuksista.",
     "gui_tor_connection_canceled": "Tor-yhteyden muodostus epäonnistui.\n\nVarmista että sinulla on toimiva internet yhteys, jonka jälkeen uudelleen avaa OnionShare ja sen Tor-yhteys.",
     "gui_tor_connection_lost": "Tor-yhteys katkaistu.",
-    "gui_server_started_after_timeout": "Auto-stop ajastin loppui ennen palvelimen käynnistymistä.\nLuo uusi jako.",
-    "gui_server_timeout_expired": "Auto-stop ajastin loppui jo.\nPäivitä se jaon aloittamiseksi.",
+    "gui_server_started_after_autostop_timer": "Auto-stop ajastin loppui ennen palvelimen käynnistymistä.\nLuo uusi jako.",
+    "gui_server_autostop_timer_expired": "Auto-stop ajastin loppui jo.\nPäivitä se jaon aloittamiseksi.",
     "share_via_onionshare": "OnionShare se",
     "gui_connect_to_tor_for_onion_settings": "Yhdistä Tor-verkkoon nähdäksesi onion palvelun asetukset",
     "gui_use_legacy_v2_onions_checkbox": "Käytä vanhoja osoitteita",
@@ -179,7 +179,7 @@
     "gui_all_modes_progress_starting": "{0:s}, %p% (lasketaan)",
     "gui_all_modes_progress_eta": "{0:s}, ETA: {1:s}, %p%",
     "gui_share_mode_no_files": "Yhtäkään tiedostoa ei ole lähetetty vielä",
-    "gui_share_mode_timeout_waiting": "Odotetaan lähettämisen valmistumista",
+    "gui_share_mode_autostop_timer_waiting": "Odotetaan lähettämisen valmistumista",
     "gui_receive_mode_no_files": "Yhtäkään tiedostoa ei ole vastaanotettu vielä",
-    "gui_receive_mode_timeout_waiting": "Odotetaan vastaanottamisen valmistumista"
+    "gui_receive_mode_autostop_timer_waiting": "Odotetaan vastaanottamisen valmistumista"
 }
diff --git a/share/locale/fr.json b/share/locale/fr.json
index 89c4efc7..edc5c370 100644
--- a/share/locale/fr.json
+++ b/share/locale/fr.json
@@ -54,7 +54,7 @@
     "gui_settings_button_save": "Enregistrer",
     "gui_settings_button_cancel": "Annuler",
     "gui_settings_button_help": "Aide",
-    "gui_settings_shutdown_timeout": "Arrêter le partage à :",
+    "gui_settings_autostop_timer": "Arrêter le partage à :",
     "connecting_to_tor": "Connexion au réseau Tor",
     "help_config": "Emplacement du fichier personnalisé de configuration JSON  (facultatif)",
     "large_filesize": "Avertissement : envoyer un gros partage peut prendre des heures",
@@ -65,7 +65,7 @@
     "help_autostop_timer": "Arrêter le partage après un certain nombre de secondes",
     "gui_tor_connection_error_settings": "Essayez de modifier dans les paramètres la façon dont OnionShare se connecte au réseau Tor.",
     "no_available_port": "Impossible de trouver un port disponible pour démarrer le service oignon",
-    "gui_share_stop_server_shutdown_timeout": "Arrêter le partage ({}s restantes)",
+    "gui_share_stop_server_autostop_timer": "Arrêter le partage ({}s restantes)",
     "systray_upload_started_title": "Envoi OnionShare démarré",
     "systray_upload_started_message": "Une personne a commencé à envoyer des fichiers vers votre ordinateur",
     "gui_no_downloads": "Pas encore de téléchargement",
@@ -148,7 +148,7 @@
     "help_receive": "Recevoir des partages au lieu de les envoyer",
     "gui_receive_start_server": "Démarrer le mode réception",
     "gui_receive_stop_server": "Arrêter le mode réception",
-    "gui_receive_stop_server_shutdown_timeout": "Arrêter le mode réception ({}s restantes)",
+    "gui_receive_stop_server_autostop_timer": "Arrêter le mode réception ({}s restantes)",
     "gui_download_upload_progress_complete": "%p%, {0:s} écoulées.",
     "gui_download_upload_progress_starting": "{0:s}, %p% (estimation)",
     "gui_download_upload_progress_eta": "{0:s}, Fin : {1:s}, %p%",
@@ -172,17 +172,17 @@
     "systray_page_loaded_title": "La page a été chargée",
     "systray_download_page_loaded_message": "Une personne a chargé la page de téléchargement",
     "systray_upload_page_loaded_message": "Une personne a chargé la page d'envoi",
-    "gui_share_stop_server_shutdown_timeout_tooltip": "La minuterie d’arrêt automatique se termine à {}",
-    "gui_receive_stop_server_shutdown_timeout_tooltip": "La minuterie d’arrêt automatique se termine à {}",
+    "gui_share_stop_server_autostop_timer_tooltip": "La minuterie d’arrêt automatique se termine à {}",
+    "gui_receive_stop_server_autostop_timer_tooltip": "La minuterie d’arrêt automatique se termine à {}",
     "gui_settings_tor_bridges_obfs4_radio_option": "Utiliser les transports enfichables obfs4 intégrés",
     "gui_settings_tor_bridges_obfs4_radio_option_no_obfs4proxy": "Utiliser les transports enfichables obfs4 intégrés (exige obfs4proxy)",
     "gui_settings_tor_bridges_meek_lite_azure_radio_option": "Utiliser les transports enfichables meek_lite (Azure) intégrés",
     "gui_settings_tor_bridges_meek_lite_azure_radio_option_no_obfs4proxy": "Utiliser les transports enfichables meek_lite (Azure) intégrés (exige obfs4proxy)",
     "gui_settings_meek_lite_expensive_warning": "Avertissement : l’exploitation de ponts meek_lite demande beaucoup de ressources au Projet Tor.<br><br>Ne les utilisez que si vous ne pouvez pas vous connecter directement à Tor par les transports obfs4 ou autres ponts normaux.",
-    "gui_settings_shutdown_timeout_checkbox": "Utiliser la minuterie d’arrêt automatique",
-    "gui_server_started_after_timeout": "La minuterie d’arrêt automatique est arrivée au bout de son délai avant le démarrage du serveur.\nVeuillez mettre en place un nouveau partage.",
-    "gui_server_timeout_expired": "La minuterie d’arrêt automatique est déjà arrivée au bout de son délai.\nVeuillez la mettre à jour pour commencer le partage.",
-    "close_on_timeout": "Arrêté, car la minuterie d’arrêt automatique est arrivée au bout de son délai",
+    "gui_settings_autostop_timer_checkbox": "Utiliser la minuterie d’arrêt automatique",
+    "gui_server_started_after_autostop_timer": "La minuterie d’arrêt automatique est arrivée au bout de son délai avant le démarrage du serveur.\nVeuillez mettre en place un nouveau partage.",
+    "gui_server_autostop_timer_expired": "La minuterie d’arrêt automatique est déjà arrivée au bout de son délai.\nVeuillez la mettre à jour pour commencer le partage.",
+    "close_on_autostop_timer": "Arrêté, car la minuterie d’arrêt automatique est arrivée au bout de son délai",
     "gui_add_files": "Ajouter des fichiers",
     "gui_add_folder": "Ajouter un dossier",
     "error_cannot_create_data_dir": "Impossible de créer le dossier de données d’OnionShare : {}",
@@ -206,9 +206,9 @@
     "gui_all_modes_progress_starting": "{0:s}, %p % (estimation)",
     "gui_all_modes_progress_eta": "{0:s}, fin prévue : {1:s}, %p %",
     "gui_share_mode_no_files": "Aucun fichier n’a encore été envoyé",
-    "gui_share_mode_timeout_waiting": "En attente de la fin de l’envoi",
+    "gui_share_mode_autostop_timer_waiting": "En attente de la fin de l’envoi",
     "gui_receive_mode_no_files": "Aucun fichier n’a encore été reçu",
-    "gui_receive_mode_timeout_waiting": "En attente de la fin de la réception",
+    "gui_receive_mode_autostop_timer_waiting": "En attente de la fin de la réception",
     "gui_connect_to_tor_for_onion_settings": "Se connecter à Tor pour voir les paramètres du service onion",
     "systray_share_completed_message": "L’envoi de fichiers est terminé",
     "gui_all_modes_transfer_canceled": "Annulé le {}",
diff --git a/share/locale/ga.json b/share/locale/ga.json
index 339a1b83..40dbc446 100644
--- a/share/locale/ga.json
+++ b/share/locale/ga.json
@@ -10,7 +10,7 @@
     "not_a_readable_file": "Ní comhad inléite é {0:s}.",
     "no_available_port": "Níorbh fhéidir port a aimsiú chun an tseirbhís onion a thosú",
     "other_page_loaded": "Seoladh lódáilte",
-    "close_on_timeout": "Cuireadh stop leis toisc go bhfuil an t-amadóir caite",
+    "close_on_autostop_timer": "Cuireadh stop leis toisc go bhfuil an t-amadóir caite",
     "closing_automatically": "Cuireadh stop leis toisc go bhfuil an íoslódáil críochnaithe",
     "timeout_download_still_running": "Ag fanacht go gcríochnódh an íoslódáil",
     "large_filesize": "Rabhadh: D'fhéadfadh go dtógfadh sé tamall fada comhad mór a sheoladh",
@@ -37,12 +37,12 @@
     "gui_choose_items": "Roghnaigh",
     "gui_share_start_server": "Comhroinn",
     "gui_share_stop_server": "Stop ag comhroinnt",
-    "gui_share_stop_server_shutdown_timeout": "Stop ag Comhroinnt ({}s fágtha)",
-    "gui_share_stop_server_shutdown_timeout_tooltip": "Amadóir uathstoptha caite {}",
+    "gui_share_stop_server_autostop_timer": "Stop ag Comhroinnt ({}s fágtha)",
+    "gui_share_stop_server_autostop_timer_tooltip": "Amadóir uathstoptha caite {}",
     "gui_receive_start_server": "Tosaigh an Mód Glactha",
     "gui_receive_stop_server": "Stop an Mód Glactha",
-    "gui_receive_stop_server_shutdown_timeout": "Stop an Mód Glactha ({}s fágtha)",
-    "gui_receive_stop_server_shutdown_timeout_tooltip": "Amadóir uathstoptha caite {}",
+    "gui_receive_stop_server_autostop_timer": "Stop an Mód Glactha ({}s fágtha)",
+    "gui_receive_stop_server_autostop_timer_tooltip": "Amadóir uathstoptha caite {}",
     "gui_copy_url": "Cóipeáil an Seoladh",
     "gui_copy_hidservauth": "Cóipeáil HidServAuth",
     "gui_downloads": "Stair Íoslódála",
@@ -104,8 +104,8 @@
     "gui_settings_button_save": "Sábháil",
     "gui_settings_button_cancel": "Cealaigh",
     "gui_settings_button_help": "Cabhair",
-    "gui_settings_shutdown_timeout_checkbox": "Úsáid amadóir uathstoptha",
-    "gui_settings_shutdown_timeout": "Stop ag comhroinnt ag:",
+    "gui_settings_autostop_timer_checkbox": "Úsáid amadóir uathstoptha",
+    "gui_settings_autostop_timer": "Stop ag comhroinnt ag:",
     "settings_error_unknown": "Ní féidir ceangal a bhunú leis an rialaitheoir Tor toisc nach féidir linn ciall a bhaint as na socruithe.",
     "settings_error_automatic": "Níorbh fhéidir ceangal a bhunú leis an rialaitheoir Tor. An bhfuil Brabhsálaí Tor (ar fáil ó torproject.org) ag rith sa gcúlra?",
     "settings_error_socket_port": "Ní féidir ceangal a bhunú leis an rialaitheoir Tor ag {}:{}.",
@@ -131,8 +131,8 @@
     "gui_tor_connection_error_settings": "Bain triail as na socruithe líonra a athrú chun ceangal le líonra Tor ó OnionShare.",
     "gui_tor_connection_canceled": "Níorbh fhéidir ceangal a bhunú le Tor.\n\nDeimhnigh go bhfuil tú ceangailte leis an Idirlíon, ansin oscail OnionShare arís agus socraigh an ceangal le Tor.",
     "gui_tor_connection_lost": "Dícheangailte ó Tor.",
-    "gui_server_started_after_timeout": "Bhí an t-amadóir uathstoptha caite sular thosaigh an freastalaí.\nCaithfidh tú comhroinnt nua a chruthú.",
-    "gui_server_timeout_expired": "Tá an t-amadóir uathstoptha caite cheana.\nCaithfidh tú é a athshocrú sular féidir leat comhaid a chomhroinnt.",
+    "gui_server_started_after_autostop_timer": "Bhí an t-amadóir uathstoptha caite sular thosaigh an freastalaí.\nCaithfidh tú comhroinnt nua a chruthú.",
+    "gui_server_autostop_timer_expired": "Tá an t-amadóir uathstoptha caite cheana.\nCaithfidh tú é a athshocrú sular féidir leat comhaid a chomhroinnt.",
     "share_via_onionshare": "Comhroinn trí OnionShare é",
     "gui_use_legacy_v2_onions_checkbox": "Úsáid seoltaí sean-nóis",
     "gui_save_private_key_checkbox": "Úsáid seoladh seasmhach (seanleagan)",
diff --git a/share/locale/gu.json b/share/locale/gu.json
index 48b5d8b2..4926eed3 100644
--- a/share/locale/gu.json
+++ b/share/locale/gu.json
@@ -10,7 +10,7 @@
     "not_a_readable_file": "",
     "no_available_port": "",
     "other_page_loaded": "",
-    "close_on_timeout": "",
+    "close_on_autostop_timer": "",
     "closing_automatically": "",
     "timeout_download_still_running": "",
     "timeout_upload_still_running": "",
@@ -38,12 +38,12 @@
     "gui_choose_items": "",
     "gui_share_start_server": "",
     "gui_share_stop_server": "",
-    "gui_share_stop_server_shutdown_timeout": "",
-    "gui_share_stop_server_shutdown_timeout_tooltip": "",
+    "gui_share_stop_server_autostop_timer": "",
+    "gui_share_stop_server_autostop_timer_tooltip": "",
     "gui_receive_start_server": "",
     "gui_receive_stop_server": "",
-    "gui_receive_stop_server_shutdown_timeout": "",
-    "gui_receive_stop_server_shutdown_timeout_tooltip": "",
+    "gui_receive_stop_server_autostop_timer": "",
+    "gui_receive_stop_server_autostop_timer_tooltip": "",
     "gui_copy_url": "",
     "gui_copy_hidservauth": "",
     "gui_downloads": "",
@@ -105,8 +105,8 @@
     "gui_settings_button_save": "",
     "gui_settings_button_cancel": "",
     "gui_settings_button_help": "",
-    "gui_settings_shutdown_timeout_checkbox": "",
-    "gui_settings_shutdown_timeout": "",
+    "gui_settings_autostop_timer_checkbox": "",
+    "gui_settings_autostop_timer": "",
     "settings_error_unknown": "",
     "settings_error_automatic": "",
     "settings_error_socket_port": "",
@@ -132,8 +132,8 @@
     "gui_tor_connection_error_settings": "",
     "gui_tor_connection_canceled": "",
     "gui_tor_connection_lost": "",
-    "gui_server_started_after_timeout": "",
-    "gui_server_timeout_expired": "",
+    "gui_server_started_after_autostop_timer": "",
+    "gui_server_autostop_timer_expired": "",
     "share_via_onionshare": "",
     "gui_use_legacy_v2_onions_checkbox": "",
     "gui_save_private_key_checkbox": "",
diff --git a/share/locale/he.json b/share/locale/he.json
index ed49ba55..ecc7755f 100644
--- a/share/locale/he.json
+++ b/share/locale/he.json
@@ -10,7 +10,7 @@
     "not_a_readable_file": "",
     "no_available_port": "",
     "other_page_loaded": "",
-    "close_on_timeout": "",
+    "close_on_autostop_timer": "",
     "closing_automatically": "",
     "timeout_download_still_running": "",
     "timeout_upload_still_running": "",
@@ -40,12 +40,12 @@
     "gui_choose_items": "",
     "gui_share_start_server": "",
     "gui_share_stop_server": "",
-    "gui_share_stop_server_shutdown_timeout": "",
-    "gui_share_stop_server_shutdown_timeout_tooltip": "",
+    "gui_share_stop_server_autostop_timer": "",
+    "gui_share_stop_server_autostop_timer_tooltip": "",
     "gui_receive_start_server": "",
     "gui_receive_stop_server": "",
-    "gui_receive_stop_server_shutdown_timeout": "",
-    "gui_receive_stop_server_shutdown_timeout_tooltip": "",
+    "gui_receive_stop_server_autostop_timer": "",
+    "gui_receive_stop_server_autostop_timer_tooltip": "",
     "gui_copy_url": "",
     "gui_copy_hidservauth": "",
     "gui_downloads": "",
@@ -107,8 +107,8 @@
     "gui_settings_button_save": "",
     "gui_settings_button_cancel": "",
     "gui_settings_button_help": "",
-    "gui_settings_shutdown_timeout_checkbox": "",
-    "gui_settings_shutdown_timeout": "",
+    "gui_settings_autostop_timer_checkbox": "",
+    "gui_settings_autostop_timer": "",
     "settings_error_unknown": "",
     "settings_error_automatic": "",
     "settings_error_socket_port": "",
@@ -134,8 +134,8 @@
     "gui_tor_connection_error_settings": "",
     "gui_tor_connection_canceled": "",
     "gui_tor_connection_lost": "",
-    "gui_server_started_after_timeout": "",
-    "gui_server_timeout_expired": "",
+    "gui_server_started_after_autostop_timer": "",
+    "gui_server_autostop_timer_expired": "",
     "share_via_onionshare": "",
     "gui_connect_to_tor_for_onion_settings": "",
     "gui_use_legacy_v2_onions_checkbox": "",
diff --git a/share/locale/hi.json b/share/locale/hi.json
index 183ee3e0..5499eeed 100644
--- a/share/locale/hi.json
+++ b/share/locale/hi.json
@@ -10,12 +10,12 @@
     "not_a_readable_file": "",
     "no_available_port": "",
     "other_page_loaded": "",
-    "close_on_timeout": "",
+    "close_on_autostop_timer": "",
     "closing_automatically": "",
     "large_filesize": "",
     "help_local_only": "",
     "help_stay_open": "",
-    "help_shutdown_timeout": "",
+    "help_autostop_timer": "",
     "help_stealth": "",
     "help_receive": "",
     "help_debug": "",
@@ -29,12 +29,12 @@
     "gui_choose_items": "चुनें",
     "gui_share_start_server": "",
     "gui_share_stop_server": "",
-    "gui_share_stop_server_shutdown_timeout": "",
-    "gui_share_stop_server_shutdown_timeout_tooltip": "",
+    "gui_share_stop_server_autostop_timer": "",
+    "gui_share_stop_server_autostop_timer_tooltip": "",
     "gui_receive_start_server": "",
     "gui_receive_stop_server": "",
-    "gui_receive_stop_server_shutdown_timeout": "",
-    "gui_receive_stop_server_shutdown_timeout_tooltip": "",
+    "gui_receive_stop_server_autostop_timer": "",
+    "gui_receive_stop_server_autostop_timer_tooltip": "",
     "gui_copy_url": "",
     "gui_copy_hidservauth": "",
     "gui_canceled": "Canceled",
@@ -92,8 +92,8 @@
     "gui_settings_button_save": "सहेजें",
     "gui_settings_button_cancel": "रद्द करे",
     "gui_settings_button_help": "मदद",
-    "gui_settings_shutdown_timeout_checkbox": "",
-    "gui_settings_shutdown_timeout": "",
+    "gui_settings_autostop_timer_checkbox": "",
+    "gui_settings_autostop_timer": "",
     "settings_error_unknown": "",
     "settings_error_automatic": "",
     "settings_error_socket_port": "",
@@ -119,8 +119,8 @@
     "gui_tor_connection_error_settings": "",
     "gui_tor_connection_canceled": "",
     "gui_tor_connection_lost": "",
-    "gui_server_started_after_timeout": "",
-    "gui_server_timeout_expired": "",
+    "gui_server_started_after_autostop_timer": "",
+    "gui_server_autostop_timer_expired": "",
     "share_via_onionshare": "",
     "gui_connect_to_tor_for_onion_settings": "",
     "gui_use_legacy_v2_onions_checkbox": "",
@@ -178,7 +178,7 @@
     "gui_all_modes_progress_starting": "",
     "gui_all_modes_progress_eta": "",
     "gui_share_mode_no_files": "",
-    "gui_share_mode_timeout_waiting": "",
+    "gui_share_mode_autostop_timer_waiting": "",
     "gui_receive_mode_no_files": "",
-    "gui_receive_mode_timeout_waiting": ""
+    "gui_receive_mode_autostop_timer_waiting": ""
 }
diff --git a/share/locale/hu.json b/share/locale/hu.json
index eba9798d..cbd71217 100644
--- a/share/locale/hu.json
+++ b/share/locale/hu.json
@@ -10,7 +10,7 @@
     "not_a_readable_file": "",
     "no_available_port": "",
     "other_page_loaded": "",
-    "close_on_timeout": "",
+    "close_on_autostop_timer": "",
     "closing_automatically": "",
     "timeout_download_still_running": "",
     "large_filesize": "",
@@ -37,12 +37,12 @@
     "gui_choose_items": "Kiválaszt",
     "gui_share_start_server": "",
     "gui_share_stop_server": "",
-    "gui_share_stop_server_shutdown_timeout": "",
-    "gui_share_stop_server_shutdown_timeout_tooltip": "",
+    "gui_share_stop_server_autostop_timer": "",
+    "gui_share_stop_server_autostop_timer_tooltip": "",
     "gui_receive_start_server": "",
     "gui_receive_stop_server": "",
-    "gui_receive_stop_server_shutdown_timeout": "",
-    "gui_receive_stop_server_shutdown_timeout_tooltip": "",
+    "gui_receive_stop_server_autostop_timer": "",
+    "gui_receive_stop_server_autostop_timer_tooltip": "",
     "gui_copy_url": "",
     "gui_copy_hidservauth": "",
     "gui_downloads": "",
@@ -104,8 +104,8 @@
     "gui_settings_button_save": "Mentés",
     "gui_settings_button_cancel": "Megszakítás",
     "gui_settings_button_help": "Súgó",
-    "gui_settings_shutdown_timeout_checkbox": "",
-    "gui_settings_shutdown_timeout": "",
+    "gui_settings_autostop_timer_checkbox": "",
+    "gui_settings_autostop_timer": "",
     "settings_error_unknown": "",
     "settings_error_automatic": "",
     "settings_error_socket_port": "",
@@ -131,8 +131,8 @@
     "gui_tor_connection_error_settings": "",
     "gui_tor_connection_canceled": "",
     "gui_tor_connection_lost": "",
-    "gui_server_started_after_timeout": "",
-    "gui_server_timeout_expired": "",
+    "gui_server_started_after_autostop_timer": "",
+    "gui_server_autostop_timer_expired": "",
     "share_via_onionshare": "",
     "gui_use_legacy_v2_onions_checkbox": "",
     "gui_save_private_key_checkbox": "",
diff --git a/share/locale/id.json b/share/locale/id.json
index bc8dfad6..93677f44 100644
--- a/share/locale/id.json
+++ b/share/locale/id.json
@@ -10,7 +10,7 @@
     "not_a_readable_file": "{0:s} bukan berkas yang bisa dibaca.",
     "no_available_port": "Tidak dapat menemukan porta yang tersedia untuk memulai layanan onion",
     "other_page_loaded": "Alamat dimuat",
-    "close_on_timeout": "",
+    "close_on_autostop_timer": "",
     "closing_automatically": "Terhenti karena transfer telah tuntas",
     "timeout_download_still_running": "",
     "large_filesize": "Peringatan: Mengirim dalam jumlah besar dapat memakan waktu berjam-jam",
@@ -37,12 +37,12 @@
     "gui_choose_items": "Pilih",
     "gui_share_start_server": "Mulai berbagi",
     "gui_share_stop_server": "Berhenti berbagi",
-    "gui_share_stop_server_shutdown_timeout": "Berhenti Berbagi ({}d tersisa)",
-    "gui_share_stop_server_shutdown_timeout_tooltip": "",
+    "gui_share_stop_server_autostop_timer": "Berhenti Berbagi ({}d tersisa)",
+    "gui_share_stop_server_autostop_timer_tooltip": "",
     "gui_receive_start_server": "Mulai Mode Menerima",
     "gui_receive_stop_server": "Menghentikan Mode Menerima",
-    "gui_receive_stop_server_shutdown_timeout": "Menghentikan Mode Menerima ({}d tersisa)",
-    "gui_receive_stop_server_shutdown_timeout_tooltip": "",
+    "gui_receive_stop_server_autostop_timer": "Menghentikan Mode Menerima ({}d tersisa)",
+    "gui_receive_stop_server_autostop_timer_tooltip": "",
     "gui_copy_url": "Salin Alamat",
     "gui_copy_hidservauth": "Salin HidServAuth",
     "gui_downloads": "",
@@ -104,8 +104,8 @@
     "gui_settings_button_save": "Simpan",
     "gui_settings_button_cancel": "Batal",
     "gui_settings_button_help": "",
-    "gui_settings_shutdown_timeout_checkbox": "",
-    "gui_settings_shutdown_timeout": "",
+    "gui_settings_autostop_timer_checkbox": "",
+    "gui_settings_autostop_timer": "",
     "settings_error_unknown": "",
     "settings_error_automatic": "",
     "settings_error_socket_port": "",
@@ -131,8 +131,8 @@
     "gui_tor_connection_error_settings": "",
     "gui_tor_connection_canceled": "",
     "gui_tor_connection_lost": "",
-    "gui_server_started_after_timeout": "",
-    "gui_server_timeout_expired": "",
+    "gui_server_started_after_autostop_timer": "",
+    "gui_server_autostop_timer_expired": "",
     "share_via_onionshare": "",
     "gui_use_legacy_v2_onions_checkbox": "",
     "gui_save_private_key_checkbox": "",
diff --git a/share/locale/is.json b/share/locale/is.json
index 9109ec09..201c7ac7 100644
--- a/share/locale/is.json
+++ b/share/locale/is.json
@@ -10,7 +10,7 @@
     "not_a_readable_file": "",
     "no_available_port": "",
     "other_page_loaded": "",
-    "close_on_timeout": "",
+    "close_on_autostop_timer": "",
     "closing_automatically": "",
     "timeout_download_still_running": "",
     "large_filesize": "",
@@ -37,12 +37,12 @@
     "gui_choose_items": "",
     "gui_share_start_server": "",
     "gui_share_stop_server": "",
-    "gui_share_stop_server_shutdown_timeout": "",
-    "gui_share_stop_server_shutdown_timeout_tooltip": "",
+    "gui_share_stop_server_autostop_timer": "",
+    "gui_share_stop_server_autostop_timer_tooltip": "",
     "gui_receive_start_server": "",
     "gui_receive_stop_server": "",
-    "gui_receive_stop_server_shutdown_timeout": "",
-    "gui_receive_stop_server_shutdown_timeout_tooltip": "",
+    "gui_receive_stop_server_autostop_timer": "",
+    "gui_receive_stop_server_autostop_timer_tooltip": "",
     "gui_copy_url": "",
     "gui_copy_hidservauth": "",
     "gui_downloads": "",
@@ -104,8 +104,8 @@
     "gui_settings_button_save": "",
     "gui_settings_button_cancel": "",
     "gui_settings_button_help": "",
-    "gui_settings_shutdown_timeout_checkbox": "",
-    "gui_settings_shutdown_timeout": "",
+    "gui_settings_autostop_timer_checkbox": "",
+    "gui_settings_autostop_timer": "",
     "settings_error_unknown": "",
     "settings_error_automatic": "",
     "settings_error_socket_port": "",
@@ -131,8 +131,8 @@
     "gui_tor_connection_error_settings": "",
     "gui_tor_connection_canceled": "",
     "gui_tor_connection_lost": "",
-    "gui_server_started_after_timeout": "",
-    "gui_server_timeout_expired": "",
+    "gui_server_started_after_autostop_timer": "",
+    "gui_server_autostop_timer_expired": "",
     "share_via_onionshare": "",
     "gui_use_legacy_v2_onions_checkbox": "",
     "gui_save_private_key_checkbox": "",
diff --git a/share/locale/it.json b/share/locale/it.json
index fee0f20a..c882bea3 100644
--- a/share/locale/it.json
+++ b/share/locale/it.json
@@ -28,7 +28,7 @@
     "give_this_url_receive_stealth": "Condividi questo indirizzo e la linea HideServAuth con il mittente:",
     "not_a_readable_file": "{0:s} non è un file leggibile.",
     "no_available_port": "Non è stato possibile trovare alcuna porta per avviare il servizio onion",
-    "close_on_timeout": "Arrestato per tempo scaduto",
+    "close_on_autostop_timer": "Arrestato per tempo scaduto",
     "timeout_download_still_running": "download in corso, attendere",
     "systray_menu_exit": "Termina",
     "systray_download_started_title": "Download con OnionShare avviato",
@@ -42,12 +42,12 @@
     "help_autostop_timer": "Termina la condivisione dopo alcuni secondi",
     "help_stealth": "Usa l'autorizzazione del client (avanzato)",
     "help_config": "Specifica il percorso del file di configurazione del JSON personalizzato",
-    "gui_share_stop_server_shutdown_timeout": "Arresta la condivisione ({}s rimanenti)",
-    "gui_share_stop_server_shutdown_timeout_tooltip": "Il timer si arresterà tra {}",
+    "gui_share_stop_server_autostop_timer": "Arresta la condivisione ({}s rimanenti)",
+    "gui_share_stop_server_autostop_timer_tooltip": "Il timer si arresterà tra {}",
     "gui_receive_start_server": "Inizia la ricezione",
     "gui_receive_stop_server": "Arresta la ricezione",
-    "gui_receive_stop_server_shutdown_timeout": "Interrompi la ricezione ({}s rimanenti)",
-    "gui_receive_stop_server_shutdown_timeout_tooltip": "Il timer termina tra {}",
+    "gui_receive_stop_server_autostop_timer": "Interrompi la ricezione ({}s rimanenti)",
+    "gui_receive_stop_server_autostop_timer_tooltip": "Il timer termina tra {}",
     "gui_copy_hidservauth": "Copia HidServAuth",
     "gui_no_downloads": "Ancora nessun Download",
     "gui_copied_url_title": "Indirizzo OnionShare copiato",
@@ -109,8 +109,8 @@
     "gui_settings_button_save": "Salva",
     "gui_settings_button_cancel": "Cancella",
     "gui_settings_button_help": "Aiuto",
-    "gui_settings_shutdown_timeout_checkbox": "Utilizza il timer di arresto automatico",
-    "gui_settings_shutdown_timeout": "Ferma la condivisione alle:",
+    "gui_settings_autostop_timer_checkbox": "Utilizza il timer di arresto automatico",
+    "gui_settings_autostop_timer": "Ferma la condivisione alle:",
     "settings_error_unknown": "Impossibile connettersi al controller Tor perché le tue impostazioni non hanno senso.",
     "settings_error_automatic": "Impossibile connettersi al controller Tor. Tor Browser (disponibile da torproject.org) è in esecuzione in background?",
     "settings_error_socket_port": "Impossibile connettersi al controller Tor in {}: {}.",
@@ -136,8 +136,8 @@
     "gui_tor_connection_error_settings": "Prova a modificare le impostazioni di come OnionShare si connette alla rete Tor.",
     "gui_tor_connection_canceled": "Impossibile connettersi a Tor,\n\nVerifica la connessione a Internet, dopo prova a riaprire OnionShare e configurare la connessione a Tor.",
     "gui_tor_connection_lost": "Disconnesso da Tor.",
-    "gui_server_started_after_timeout": "Il timer auto-stop si è esaurito prima dell'avvio del server.\nSi prega di fare una nuova condivisione.",
-    "gui_server_timeout_expired": "Il timer auto-stop ha già finito.\nPer favore aggiornalo per iniziare la condivisione.",
+    "gui_server_started_after_autostop_timer": "Il timer auto-stop si è esaurito prima dell'avvio del server.\nSi prega di fare una nuova condivisione.",
+    "gui_server_autostop_timer_expired": "Il timer auto-stop ha già finito.\nPer favore aggiornalo per iniziare la condivisione.",
     "share_via_onionshare": "Usa OnionShare",
     "gui_connect_to_tor_for_onion_settings": "Connetti a Tor per vedere le impostazioni del servizio onion",
     "gui_use_legacy_v2_onions_checkbox": "Usa gli indirizzi legacy",
@@ -210,7 +210,7 @@
     "gui_all_modes_progress_starting": "{0:s}, %p% (in calcolo)",
     "gui_all_modes_progress_eta": "{0:s}, ETA: {1:s}, %p%",
     "gui_share_mode_no_files": "Nessun file ancora inviato",
-    "gui_share_mode_timeout_waiting": "In attesa di finire l'invio",
+    "gui_share_mode_autostop_timer_waiting": "In attesa di finire l'invio",
     "gui_receive_mode_no_files": "Nessun file ricevuto ancora",
-    "gui_receive_mode_timeout_waiting": "In attesa di finire la ricezione"
+    "gui_receive_mode_autostop_timer_waiting": "In attesa di finire la ricezione"
 }
diff --git a/share/locale/ja.json b/share/locale/ja.json
index f6846c52..3c4b4369 100644
--- a/share/locale/ja.json
+++ b/share/locale/ja.json
@@ -10,7 +10,7 @@
     "not_a_readable_file": "{0:s}は読めるファイルではありません。",
     "no_available_port": "onionサービスを実行するための利用可能ポートを見つかりません",
     "other_page_loaded": "アドレスはロードされています",
-    "close_on_timeout": "自動タイマーがタイムアウトしたため停止されました",
+    "close_on_autostop_timer": "自動タイマーがタイムアウトしたため停止されました",
     "closing_automatically": "転送が完了されたため停止されました",
     "timeout_download_still_running": "ダウンロード完了待ち",
     "timeout_upload_still_running": "アップロード完了待ち",
@@ -40,12 +40,12 @@
     "gui_choose_items": "選択",
     "gui_share_start_server": "共有を開始する",
     "gui_share_stop_server": "共有を停止する",
-    "gui_share_stop_server_shutdown_timeout": "共有を停止中です（残り{}秒）",
-    "gui_share_stop_server_shutdown_timeout_tooltip": "{}に自動停止します",
+    "gui_share_stop_server_autostop_timer": "共有を停止中です（残り{}秒）",
+    "gui_share_stop_server_autostop_timer_tooltip": "{}に自動停止します",
     "gui_receive_start_server": "受信モードを開始",
     "gui_receive_stop_server": "受信モードを停止",
-    "gui_receive_stop_server_shutdown_timeout": "受信モードを停止中（残り{}秒）",
-    "gui_receive_stop_server_shutdown_timeout_tooltip": "{}に自動停止します",
+    "gui_receive_stop_server_autostop_timer": "受信モードを停止中（残り{}秒）",
+    "gui_receive_stop_server_autostop_timer_tooltip": "{}に自動停止します",
     "gui_copy_url": "アドレスをコピー",
     "gui_copy_hidservauth": "HidServAuthをコピー",
     "gui_downloads": "ダウンロード履歴",
@@ -107,8 +107,8 @@
     "gui_settings_button_save": "保存",
     "gui_settings_button_cancel": "キャンセル",
     "gui_settings_button_help": "ヘルプ",
-    "gui_settings_shutdown_timeout_checkbox": "自動停止タイマーを使用する",
-    "gui_settings_shutdown_timeout": "共有を停止する時間：",
+    "gui_settings_autostop_timer_checkbox": "自動停止タイマーを使用する",
+    "gui_settings_autostop_timer": "共有を停止する時間：",
     "settings_error_unknown": "設定を解釈できないため、Torコントローラーと接続できません。",
     "settings_error_automatic": "Torコントローラーと接続できません。Torブラウザ（torproject.orgから入手できる）がバックグラウンドで動作していますか？",
     "settings_error_socket_port": "{}:{}でTorコントローラーと接続できません。",
@@ -134,8 +134,8 @@
     "gui_tor_connection_error_settings": "設定でTorとの接続方法を変更してみて下さい。",
     "gui_tor_connection_canceled": "Torと接続できませんでした。\n\nインターネット接続を確認してから、OnionShareを再開してTorとの接続を設定して下さい。",
     "gui_tor_connection_lost": "Torから切断されました。",
-    "gui_server_started_after_timeout": "サーバーが起動した前、自動停止タイマーがタイムアウトしました。\n再びファイル共有をして下さい。",
-    "gui_server_timeout_expired": "自動停止タイマーはすでにタイムアウトしています。\n共有し始めるにはリセットして下さい。",
+    "gui_server_started_after_autostop_timer": "サーバーが起動した前、自動停止タイマーがタイムアウトしました。\n再びファイル共有をして下さい。",
+    "gui_server_autostop_timer_expired": "自動停止タイマーはすでにタイムアウトしています。\n共有し始めるにはリセットして下さい。",
     "share_via_onionshare": "OnionShareで共有する",
     "gui_connect_to_tor_for_onion_settings": "onionサービス設定を見るのにTorと接続して下さい",
     "gui_use_legacy_v2_onions_checkbox": "レガシーアドレスを使用する",
@@ -209,8 +209,8 @@
     "gui_all_modes_progress_starting": "{0:s}, %p% (計算中)",
     "gui_all_modes_progress_eta": "{0:s}, 完了予定時刻: {1:s}, %p%",
     "gui_share_mode_no_files": "送信されたファイルがまだありません",
-    "gui_share_mode_timeout_waiting": "送信完了を待機しています",
+    "gui_share_mode_autostop_timer_waiting": "送信完了を待機しています",
     "gui_receive_mode_no_files": "受信されたファイルがまだありません",
-    "gui_receive_mode_timeout_waiting": "受信完了を待機しています",
+    "gui_receive_mode_autostop_timer_waiting": "受信完了を待機しています",
     "gui_settings_onion_label": "Onion設定"
 }
diff --git a/share/locale/ka.json b/share/locale/ka.json
index 72c24efd..2755e452 100644
--- a/share/locale/ka.json
+++ b/share/locale/ka.json
@@ -10,7 +10,7 @@
     "not_a_readable_file": "",
     "no_available_port": "",
     "other_page_loaded": "",
-    "close_on_timeout": "",
+    "close_on_autostop_timer": "",
     "closing_automatically": "",
     "timeout_download_still_running": "",
     "large_filesize": "",
@@ -37,12 +37,12 @@
     "gui_choose_items": "",
     "gui_share_start_server": "",
     "gui_share_stop_server": "",
-    "gui_share_stop_server_shutdown_timeout": "",
-    "gui_share_stop_server_shutdown_timeout_tooltip": "",
+    "gui_share_stop_server_autostop_timer": "",
+    "gui_share_stop_server_autostop_timer_tooltip": "",
     "gui_receive_start_server": "",
     "gui_receive_stop_server": "",
-    "gui_receive_stop_server_shutdown_timeout": "",
-    "gui_receive_stop_server_shutdown_timeout_tooltip": "",
+    "gui_receive_stop_server_autostop_timer": "",
+    "gui_receive_stop_server_autostop_timer_tooltip": "",
     "gui_copy_url": "",
     "gui_copy_hidservauth": "",
     "gui_downloads": "",
@@ -104,8 +104,8 @@
     "gui_settings_button_save": "",
     "gui_settings_button_cancel": "",
     "gui_settings_button_help": "",
-    "gui_settings_shutdown_timeout_checkbox": "",
-    "gui_settings_shutdown_timeout": "",
+    "gui_settings_autostop_timer_checkbox": "",
+    "gui_settings_autostop_timer": "",
     "settings_error_unknown": "",
     "settings_error_automatic": "",
     "settings_error_socket_port": "",
@@ -131,8 +131,8 @@
     "gui_tor_connection_error_settings": "",
     "gui_tor_connection_canceled": "",
     "gui_tor_connection_lost": "",
-    "gui_server_started_after_timeout": "",
-    "gui_server_timeout_expired": "",
+    "gui_server_started_after_autostop_timer": "",
+    "gui_server_autostop_timer_expired": "",
     "share_via_onionshare": "",
     "gui_use_legacy_v2_onions_checkbox": "",
     "gui_save_private_key_checkbox": "",
diff --git a/share/locale/ko.json b/share/locale/ko.json
index e766fa05..84498176 100644
--- a/share/locale/ko.json
+++ b/share/locale/ko.json
@@ -10,7 +10,7 @@
     "not_a_readable_file": "{0:s} 는 읽을수 없는 파일입니다.",
     "no_available_port": "어니언 서비스를 시작하기 위한 사용 가능한 포트를 찾을수 없었습니다",
     "other_page_loaded": "주소가 로드되다",
-    "close_on_timeout": "자동멈춤 타이머가 끝났기 때문에 정지되다",
+    "close_on_autostop_timer": "자동멈춤 타이머가 끝났기 때문에 정지되다",
     "closing_automatically": "다운로드가 완료되었기 때문에 정지되다",
     "timeout_download_still_running": "다운로드가 완료되기를 기다리는 중입니다",
     "timeout_upload_still_running": "업로드가 완료되기를 기다리는 중입니다",
@@ -38,12 +38,12 @@
     "gui_choose_items": "선택",
     "gui_share_start_server": "",
     "gui_share_stop_server": "",
-    "gui_share_stop_server_shutdown_timeout": "",
-    "gui_share_stop_server_shutdown_timeout_tooltip": "",
+    "gui_share_stop_server_autostop_timer": "",
+    "gui_share_stop_server_autostop_timer_tooltip": "",
     "gui_receive_start_server": "",
     "gui_receive_stop_server": "",
-    "gui_receive_stop_server_shutdown_timeout": "",
-    "gui_receive_stop_server_shutdown_timeout_tooltip": "",
+    "gui_receive_stop_server_autostop_timer": "",
+    "gui_receive_stop_server_autostop_timer_tooltip": "",
     "gui_copy_url": "",
     "gui_copy_hidservauth": "",
     "gui_downloads": "",
@@ -105,8 +105,8 @@
     "gui_settings_button_save": "저장",
     "gui_settings_button_cancel": "취소",
     "gui_settings_button_help": "도움말",
-    "gui_settings_shutdown_timeout_checkbox": "",
-    "gui_settings_shutdown_timeout": "",
+    "gui_settings_autostop_timer_checkbox": "",
+    "gui_settings_autostop_timer": "",
     "settings_error_unknown": "",
     "settings_error_automatic": "",
     "settings_error_socket_port": "",
@@ -132,8 +132,8 @@
     "gui_tor_connection_error_settings": "",
     "gui_tor_connection_canceled": "",
     "gui_tor_connection_lost": "",
-    "gui_server_started_after_timeout": "",
-    "gui_server_timeout_expired": "",
+    "gui_server_started_after_autostop_timer": "",
+    "gui_server_autostop_timer_expired": "",
     "share_via_onionshare": "",
     "gui_use_legacy_v2_onions_checkbox": "",
     "gui_save_private_key_checkbox": "",
diff --git a/share/locale/lg.json b/share/locale/lg.json
index 8c1819bd..7dbce74b 100644
--- a/share/locale/lg.json
+++ b/share/locale/lg.json
@@ -10,7 +10,7 @@
     "not_a_readable_file": "",
     "no_available_port": "",
     "other_page_loaded": "",
-    "close_on_timeout": "",
+    "close_on_autostop_timer": "",
     "closing_automatically": "",
     "timeout_download_still_running": "",
     "timeout_upload_still_running": "",
@@ -38,12 +38,12 @@
     "gui_choose_items": "",
     "gui_share_start_server": "",
     "gui_share_stop_server": "",
-    "gui_share_stop_server_shutdown_timeout": "",
-    "gui_share_stop_server_shutdown_timeout_tooltip": "",
+    "gui_share_stop_server_autostop_timer": "",
+    "gui_share_stop_server_autostop_timer_tooltip": "",
     "gui_receive_start_server": "",
     "gui_receive_stop_server": "",
-    "gui_receive_stop_server_shutdown_timeout": "",
-    "gui_receive_stop_server_shutdown_timeout_tooltip": "",
+    "gui_receive_stop_server_autostop_timer": "",
+    "gui_receive_stop_server_autostop_timer_tooltip": "",
     "gui_copy_url": "",
     "gui_copy_hidservauth": "",
     "gui_downloads": "",
@@ -105,8 +105,8 @@
     "gui_settings_button_save": "",
     "gui_settings_button_cancel": "",
     "gui_settings_button_help": "",
-    "gui_settings_shutdown_timeout_checkbox": "",
-    "gui_settings_shutdown_timeout": "",
+    "gui_settings_autostop_timer_checkbox": "",
+    "gui_settings_autostop_timer": "",
     "settings_error_unknown": "",
     "settings_error_automatic": "",
     "settings_error_socket_port": "",
@@ -132,8 +132,8 @@
     "gui_tor_connection_error_settings": "",
     "gui_tor_connection_canceled": "",
     "gui_tor_connection_lost": "",
-    "gui_server_started_after_timeout": "",
-    "gui_server_timeout_expired": "",
+    "gui_server_started_after_autostop_timer": "",
+    "gui_server_autostop_timer_expired": "",
     "share_via_onionshare": "",
     "gui_use_legacy_v2_onions_checkbox": "",
     "gui_save_private_key_checkbox": "",
diff --git a/share/locale/mk.json b/share/locale/mk.json
index 6228bfaa..7302d465 100644
--- a/share/locale/mk.json
+++ b/share/locale/mk.json
@@ -10,7 +10,7 @@
     "not_a_readable_file": "",
     "no_available_port": "",
     "other_page_loaded": "",
-    "close_on_timeout": "",
+    "close_on_autostop_timer": "",
     "closing_automatically": "",
     "timeout_download_still_running": "",
     "large_filesize": "",
@@ -37,12 +37,12 @@
     "gui_choose_items": "",
     "gui_share_start_server": "",
     "gui_share_stop_server": "",
-    "gui_share_stop_server_shutdown_timeout": "",
-    "gui_share_stop_server_shutdown_timeout_tooltip": "",
+    "gui_share_stop_server_autostop_timer": "",
+    "gui_share_stop_server_autostop_timer_tooltip": "",
     "gui_receive_start_server": "",
     "gui_receive_stop_server": "",
-    "gui_receive_stop_server_shutdown_timeout": "",
-    "gui_receive_stop_server_shutdown_timeout_tooltip": "",
+    "gui_receive_stop_server_autostop_timer": "",
+    "gui_receive_stop_server_autostop_timer_tooltip": "",
     "gui_copy_url": "",
     "gui_copy_hidservauth": "",
     "gui_downloads": "",
@@ -104,8 +104,8 @@
     "gui_settings_button_save": "Зачувување",
     "gui_settings_button_cancel": "Откажи",
     "gui_settings_button_help": "",
-    "gui_settings_shutdown_timeout_checkbox": "",
-    "gui_settings_shutdown_timeout": "",
+    "gui_settings_autostop_timer_checkbox": "",
+    "gui_settings_autostop_timer": "",
     "settings_error_unknown": "",
     "settings_error_automatic": "",
     "settings_error_socket_port": "",
@@ -131,8 +131,8 @@
     "gui_tor_connection_error_settings": "",
     "gui_tor_connection_canceled": "",
     "gui_tor_connection_lost": "",
-    "gui_server_started_after_timeout": "",
-    "gui_server_timeout_expired": "",
+    "gui_server_started_after_autostop_timer": "",
+    "gui_server_autostop_timer_expired": "",
     "share_via_onionshare": "",
     "gui_use_legacy_v2_onions_checkbox": "",
     "gui_save_private_key_checkbox": "",
diff --git a/share/locale/ms.json b/share/locale/ms.json
index 465a9cd4..7ddf4396 100644
--- a/share/locale/ms.json
+++ b/share/locale/ms.json
@@ -10,12 +10,12 @@
     "not_a_readable_file": "",
     "no_available_port": "",
     "other_page_loaded": "",
-    "close_on_timeout": "",
+    "close_on_autostop_timer": "",
     "closing_automatically": "",
     "large_filesize": "",
     "help_local_only": "",
     "help_stay_open": "",
-    "help_shutdown_timeout": "",
+    "help_autostop_timer": "",
     "help_stealth": "",
     "help_receive": "",
     "help_debug": "",
@@ -29,12 +29,12 @@
     "gui_choose_items": "",
     "gui_share_start_server": "",
     "gui_share_stop_server": "",
-    "gui_share_stop_server_shutdown_timeout": "",
-    "gui_share_stop_server_shutdown_timeout_tooltip": "",
+    "gui_share_stop_server_autostop_timer": "",
+    "gui_share_stop_server_autostop_timer_tooltip": "",
     "gui_receive_start_server": "",
     "gui_receive_stop_server": "",
-    "gui_receive_stop_server_shutdown_timeout": "",
-    "gui_receive_stop_server_shutdown_timeout_tooltip": "",
+    "gui_receive_stop_server_autostop_timer": "",
+    "gui_receive_stop_server_autostop_timer_tooltip": "",
     "gui_copy_url": "",
     "gui_copy_hidservauth": "",
     "gui_canceled": "",
@@ -92,8 +92,8 @@
     "gui_settings_button_save": "",
     "gui_settings_button_cancel": "",
     "gui_settings_button_help": "",
-    "gui_settings_shutdown_timeout_checkbox": "",
-    "gui_settings_shutdown_timeout": "",
+    "gui_settings_autostop_timer_checkbox": "",
+    "gui_settings_autostop_timer": "",
     "settings_error_unknown": "",
     "settings_error_automatic": "",
     "settings_error_socket_port": "",
@@ -119,8 +119,8 @@
     "gui_tor_connection_error_settings": "",
     "gui_tor_connection_canceled": "",
     "gui_tor_connection_lost": "",
-    "gui_server_started_after_timeout": "",
-    "gui_server_timeout_expired": "",
+    "gui_server_started_after_autostop_timer": "",
+    "gui_server_autostop_timer_expired": "",
     "share_via_onionshare": "",
     "gui_connect_to_tor_for_onion_settings": "",
     "gui_use_legacy_v2_onions_checkbox": "",
@@ -178,7 +178,7 @@
     "gui_all_modes_progress_starting": "",
     "gui_all_modes_progress_eta": "",
     "gui_share_mode_no_files": "",
-    "gui_share_mode_timeout_waiting": "",
+    "gui_share_mode_autostop_timer_waiting": "",
     "gui_receive_mode_no_files": "",
-    "gui_receive_mode_timeout_waiting": ""
+    "gui_receive_mode_autostop_timer_waiting": ""
 }
diff --git a/share/locale/nl.json b/share/locale/nl.json
index 5ae039ff..55596663 100644
--- a/share/locale/nl.json
+++ b/share/locale/nl.json
@@ -8,7 +8,7 @@
     "not_a_readable_file": "{0:s} is geen leesbaar bestand.",
     "no_available_port": "Er is geen poort beschikbaar om de onion-dienst op te starten",
     "other_page_loaded": "Adres geladen",
-    "close_on_timeout": "Gestopt omdat de automatische time-out bereikt is",
+    "close_on_autostop_timer": "Gestopt omdat de automatische time-out bereikt is",
     "closing_automatically": "Gestopt omdat de download is afgerond",
     "timeout_download_still_running": "Bezig met wachten op afronden van download",
     "large_filesize": "Waarschuwing: het versturen van grote bestanden kan uren duren",
@@ -73,7 +73,7 @@
     "gui_settings_button_save": "Opslaan",
     "gui_settings_button_cancel": "Annuleren",
     "gui_settings_button_help": "Help",
-    "gui_settings_shutdown_timeout": "Stop het delen om:",
+    "gui_settings_autostop_timer": "Stop het delen om:",
     "settings_saved": "Instellingen opgeslagen in {}",
     "settings_error_unknown": "Kan geen verbinding maken met de Tor controller omdat je instellingen nergens op slaan.",
     "settings_error_automatic": "Kon geen verbinding maken met de Tor controller. Draait Tor Browser (beschikbaar via torproject.org) in de achtergrond?",
@@ -97,8 +97,8 @@
     "gui_tor_connection_ask_quit": "Afsluiten",
     "gui_tor_connection_error_settings": "Probeer hoe OnionShare verbind met het Tor network te veranderen in de instellingen.",
     "gui_tor_connection_canceled": "Kon niet verbinden met Tor.\n\nWees er zeker van dat je verbonden bent met het internet, herstart OnionShare en configureer de verbinding met Tor.",
-    "gui_server_started_after_timeout": "De auto-stop timer liep af voordat de server startte.\nMaak een nieuwe share aan.",
-    "gui_server_timeout_expired": "De auto-stop timer is al verlopen.\nStel een nieuwe tijd in om te beginnen met delen.",
+    "gui_server_started_after_autostop_timer": "De auto-stop timer liep af voordat de server startte.\nMaak een nieuwe share aan.",
+    "gui_server_autostop_timer_expired": "De auto-stop timer is al verlopen.\nStel een nieuwe tijd in om te beginnen met delen.",
     "share_via_onionshare": "Deel via OnionShare",
     "give_this_url_receive": "Geef dit adres aan de afzender:",
     "give_this_url_receive_stealth": "Geef dit adres en de HidServAuth-regel aan de afzender:",
@@ -108,12 +108,12 @@
     "timeout_upload_still_running": "Wachten op voltooiing van de upload",
     "gui_share_start_server": "Start met delen",
     "gui_share_stop_server": "Stop met delen",
-    "gui_share_stop_server_shutdown_timeout": "Stop met Delen ({}s resterend)",
-    "gui_share_stop_server_shutdown_timeout_tooltip": "Auto-stop timer eindigt bij {}",
+    "gui_share_stop_server_autostop_timer": "Stop met Delen ({}s resterend)",
+    "gui_share_stop_server_autostop_timer_tooltip": "Auto-stop timer eindigt bij {}",
     "gui_receive_start_server": "Start Ontvangstmodus",
     "gui_receive_stop_server": "Stop Ontvangstmodus",
-    "gui_receive_stop_server_shutdown_timeout": "Stop Ontvangstmodus ({}s resterend)",
-    "gui_receive_stop_server_shutdown_timeout_tooltip": "Auto-stop timer stopt bij {}",
+    "gui_receive_stop_server_autostop_timer": "Stop Ontvangstmodus ({}s resterend)",
+    "gui_receive_stop_server_autostop_timer_tooltip": "Auto-stop timer stopt bij {}",
     "gui_no_downloads": "Nog Geen Downloads",
     "gui_copied_url_title": "Gekopieerd OnionShare Adres",
     "gui_copied_hidservauth_title": "HidServAuth gekopieerd",
@@ -132,7 +132,7 @@
     "gui_settings_tor_bridges_custom_radio_option": "Gebruik custom bridges",
     "gui_settings_tor_bridges_custom_label": "Je kan bridges krijgen via <a href=\"https://bridges.torproject.org/options\">1https://bridges.torproject.org</a>2",
     "gui_settings_tor_bridges_invalid": "Geen van de bridges die je hebt toegevoegd werken. \nControleer ze of voeg andere toe.",
-    "gui_settings_shutdown_timeout_checkbox": "Gebruik auto-stop timer",
+    "gui_settings_autostop_timer_checkbox": "Gebruik auto-stop timer",
     "error_tor_protocol_error_unknown": "Er was een onbekende fout met Tor",
     "error_invalid_private_key": "Dit type privésleutel wordt niet ondersteund",
     "gui_tor_connection_lost": "De verbinding met Tor is verbroken.",
diff --git a/share/locale/no.json b/share/locale/no.json
index 4ef2721c..d46bba67 100644
--- a/share/locale/no.json
+++ b/share/locale/no.json
@@ -11,7 +11,7 @@
     "give_this_url_receive_stealth": "Gi denne adressen og HidServAuth-linjen til avsenderen:",
     "not_a_readable_file": "{0:s} er ikke en lesbar fil.",
     "no_available_port": "Fant ikke tilgjengelig port for oppstart av løktjenesten",
-    "close_on_timeout": "Stoppet fordi tidsavbruddsuret gikk ut",
+    "close_on_autostop_timer": "Stoppet fordi tidsavbruddsuret gikk ut",
     "closing_automatically": "Stoppet fordi nedlasting fullførtes",
     "timeout_download_still_running": "Venter på at nedlastingen skal fullføres",
     "large_filesize": "Advarsel: forsendelse av stor deling kan ta timer",
@@ -38,12 +38,12 @@
     "gui_choose_items": "Velg",
     "gui_share_start_server": "Start deling",
     "gui_share_stop_server": "Stopp deling",
-    "gui_share_stop_server_shutdown_timeout": "Stopp deling ({}s gjenstår)",
-    "gui_share_stop_server_shutdown_timeout_tooltip": "Tidsavbruddsuret går ut {}",
+    "gui_share_stop_server_autostop_timer": "Stopp deling ({}s gjenstår)",
+    "gui_share_stop_server_autostop_timer_tooltip": "Tidsavbruddsuret går ut {}",
     "gui_receive_start_server": "Start mottaksmodus",
     "gui_receive_stop_server": "Stopp mottaksmodus",
-    "gui_receive_stop_server_shutdown_timeout": "Stopp mottaksmodus ({}s gjenstår)",
-    "gui_receive_stop_server_shutdown_timeout_tooltip": "Tidsavbruddsuret går ut {}",
+    "gui_receive_stop_server_autostop_timer": "Stopp mottaksmodus ({}s gjenstår)",
+    "gui_receive_stop_server_autostop_timer_tooltip": "Tidsavbruddsuret går ut {}",
     "gui_copy_url": "Kopier nettadresse",
     "gui_copy_hidservauth": "Kopier HidServAuth",
     "gui_downloads": "Nedlastingshistorikk",
@@ -104,8 +104,8 @@
     "gui_settings_button_save": "Lagre",
     "gui_settings_button_cancel": "Avbryt",
     "gui_settings_button_help": "Hjelp",
-    "gui_settings_shutdown_timeout_checkbox": "Bruk tidsavbruddsur",
-    "gui_settings_shutdown_timeout": "Stopp deling ved:",
+    "gui_settings_autostop_timer_checkbox": "Bruk tidsavbruddsur",
+    "gui_settings_autostop_timer": "Stopp deling ved:",
     "settings_saved": "Innstillinger lagret i {}",
     "settings_error_unknown": "Kan ikke koble til Tor-kontroller fordi innstillingene dine ikke gir mening.",
     "settings_error_automatic": "Kunne ikke koble til Tor-kontrolleren. Kjører Tor-nettleseren (tilgjengelig fra torproject.org) i bakgrunnen?",
@@ -132,8 +132,8 @@
     "gui_tor_connection_error_settings": "Prøv å endre hvordan OnionShare kobler til Tor-nettverket i innstillingene.",
     "gui_tor_connection_canceled": "Kunne ikke koble til Tor.\n\nForsikre deg om at du er koblet til Internett, åpne så OnionShare igjen, og sett opp dets tilkobling til Tor.",
     "gui_tor_connection_lost": "Frakoblet fra Tor.",
-    "gui_server_started_after_timeout": "Tidsavbruddsuret gikk ut før tjeneren startet.\nLag en ny deling.",
-    "gui_server_timeout_expired": "Tidsavbruddsuret har gått ut allerede.\nOppdater det for å starte deling.",
+    "gui_server_started_after_autostop_timer": "Tidsavbruddsuret gikk ut før tjeneren startet.\nLag en ny deling.",
+    "gui_server_autostop_timer_expired": "Tidsavbruddsuret har gått ut allerede.\nOppdater det for å starte deling.",
     "share_via_onionshare": "OnionShare det",
     "gui_use_legacy_v2_onions_checkbox": "Bruk gammeldagse adresser",
     "gui_save_private_key_checkbox": "Bruk en vedvarende adresse",
@@ -212,9 +212,9 @@
     "gui_all_modes_progress_starting": "{0:s}, %p% (kalkulerer)",
     "gui_all_modes_progress_eta": "{0:s}, ETA: {1:s}, %p%",
     "gui_share_mode_no_files": "Ingen filer sendt enda",
-    "gui_share_mode_timeout_waiting": "Venter på fullføring av forsendelse",
+    "gui_share_mode_autostop_timer_waiting": "Venter på fullføring av forsendelse",
     "gui_receive_mode_no_files": "Ingen filer mottatt enda",
-    "gui_receive_mode_timeout_waiting": "Venter på fullføring av mottak",
+    "gui_receive_mode_autostop_timer_waiting": "Venter på fullføring av mottak",
     "gui_all_modes_transfer_canceled_range": "Avbrutt {} - {}",
     "gui_all_modes_transfer_canceled": "Avbrutt {}",
     "gui_settings_onion_label": "Løk-innstillinger"
diff --git a/share/locale/pa.json b/share/locale/pa.json
index 4cfcf0e6..57712ca0 100644
--- a/share/locale/pa.json
+++ b/share/locale/pa.json
@@ -10,7 +10,7 @@
     "not_a_readable_file": "",
     "no_available_port": "",
     "other_page_loaded": "",
-    "close_on_timeout": "",
+    "close_on_autostop_timer": "",
     "closing_automatically": "",
     "timeout_download_still_running": "",
     "large_filesize": "",
@@ -37,12 +37,12 @@
     "gui_choose_items": "",
     "gui_share_start_server": "",
     "gui_share_stop_server": "",
-    "gui_share_stop_server_shutdown_timeout": "",
-    "gui_share_stop_server_shutdown_timeout_tooltip": "",
+    "gui_share_stop_server_autostop_timer": "",
+    "gui_share_stop_server_autostop_timer_tooltip": "",
     "gui_receive_start_server": "",
     "gui_receive_stop_server": "",
-    "gui_receive_stop_server_shutdown_timeout": "",
-    "gui_receive_stop_server_shutdown_timeout_tooltip": "",
+    "gui_receive_stop_server_autostop_timer": "",
+    "gui_receive_stop_server_autostop_timer_tooltip": "",
     "gui_copy_url": "",
     "gui_copy_hidservauth": "",
     "gui_downloads": "",
@@ -104,8 +104,8 @@
     "gui_settings_button_save": "",
     "gui_settings_button_cancel": "",
     "gui_settings_button_help": "",
-    "gui_settings_shutdown_timeout_checkbox": "",
-    "gui_settings_shutdown_timeout": "",
+    "gui_settings_autostop_timer_checkbox": "",
+    "gui_settings_autostop_timer": "",
     "settings_error_unknown": "",
     "settings_error_automatic": "",
     "settings_error_socket_port": "",
@@ -131,8 +131,8 @@
     "gui_tor_connection_error_settings": "",
     "gui_tor_connection_canceled": "",
     "gui_tor_connection_lost": "",
-    "gui_server_started_after_timeout": "",
-    "gui_server_timeout_expired": "",
+    "gui_server_started_after_autostop_timer": "",
+    "gui_server_autostop_timer_expired": "",
     "share_via_onionshare": "",
     "gui_use_legacy_v2_onions_checkbox": "",
     "gui_save_private_key_checkbox": "",
diff --git a/share/locale/pl.json b/share/locale/pl.json
index 15cc3fc4..94d8dd9e 100644
--- a/share/locale/pl.json
+++ b/share/locale/pl.json
@@ -10,7 +10,7 @@
     "not_a_readable_file": "{0:s} nie jest plikiem do odczytu.",
     "no_available_port": "Nie można znaleźć dostępnego portu aby włączyć usługę onion",
     "other_page_loaded": "Adres został wczytany",
-    "close_on_timeout": "Zatrzymano, gdyż upłynął czas",
+    "close_on_autostop_timer": "Zatrzymano, gdyż upłynął czas",
     "closing_automatically": "Zatrzymano, gdyż pobieranie zostało ukończone",
     "timeout_download_still_running": "Czekam na ukończenie pobierania",
     "large_filesize": "Uwaga: Wysyłanie dużego pliku może zająć kilka godzin",
@@ -37,12 +37,12 @@
     "gui_choose_items": "Wybierz",
     "gui_share_start_server": "Rozpocznij udostępnianie",
     "gui_share_stop_server": "Zatrzymaj udostępnianie",
-    "gui_share_stop_server_shutdown_timeout": "Zatrzymaj udostępnianie (zostało {}s)",
-    "gui_share_stop_server_shutdown_timeout_tooltip": "Czas upłynie za {}",
+    "gui_share_stop_server_autostop_timer": "Zatrzymaj udostępnianie (zostało {}s)",
+    "gui_share_stop_server_autostop_timer_tooltip": "Czas upłynie za {}",
     "gui_receive_start_server": "Rozpocznij tryb odbierania",
     "gui_receive_stop_server": "Zatrzymaj tryb odbierania",
-    "gui_receive_stop_server_shutdown_timeout": "Zatrzymaj tryb odbierania (pozostało {}s)",
-    "gui_receive_stop_server_shutdown_timeout_tooltip": "Czas upływa za {}",
+    "gui_receive_stop_server_autostop_timer": "Zatrzymaj tryb odbierania (pozostało {}s)",
+    "gui_receive_stop_server_autostop_timer_tooltip": "Czas upływa za {}",
     "gui_copy_url": "Kopiuj adres załącznika",
     "gui_copy_hidservauth": "Kopiuj HidServAuth",
     "gui_downloads": "Historia pobierania",
@@ -104,8 +104,8 @@
     "gui_settings_button_save": "Zapisz",
     "gui_settings_button_cancel": "Anuluj",
     "gui_settings_button_help": "Pomoc",
-    "gui_settings_shutdown_timeout_checkbox": "",
-    "gui_settings_shutdown_timeout": "",
+    "gui_settings_autostop_timer_checkbox": "",
+    "gui_settings_autostop_timer": "",
     "settings_error_unknown": "Nie można połączyć się z kontrolerem Tor, ponieważ Twoje ustawienia nie mają sensu.",
     "settings_error_automatic": "Nie można połączyć się z kontrolerem Tor. Czy Tor Browser (dostępny na torproject.org) działa w tle?",
     "settings_error_socket_port": "Nie można połączyć się z kontrolerem Tor pod adresem {}:{}.",
@@ -131,8 +131,8 @@
     "gui_tor_connection_error_settings": "",
     "gui_tor_connection_canceled": "",
     "gui_tor_connection_lost": "",
-    "gui_server_started_after_timeout": "",
-    "gui_server_timeout_expired": "",
+    "gui_server_started_after_autostop_timer": "",
+    "gui_server_autostop_timer_expired": "",
     "share_via_onionshare": "",
     "gui_use_legacy_v2_onions_checkbox": "",
     "gui_save_private_key_checkbox": "",
diff --git a/share/locale/pt_BR.json b/share/locale/pt_BR.json
index 47030d22..69dfeb62 100644
--- a/share/locale/pt_BR.json
+++ b/share/locale/pt_BR.json
@@ -10,7 +10,7 @@
     "not_a_readable_file": "{0:s} não é um ficheiro legível.",
     "no_available_port": "Não foi possível encontrar um pórtico disponível para iniciar o serviço onion",
     "other_page_loaded": "Endereço carregado",
-    "close_on_timeout": "Interrompido ao final da contagem do cronômetro automático",
+    "close_on_autostop_timer": "Interrompido ao final da contagem do cronômetro automático",
     "closing_automatically": "Interrompido após o término da transferência",
     "timeout_download_still_running": "Esperando que o download termine",
     "large_filesize": "Aviso: O envio de arquivos grandes pode levar várias horas",
@@ -37,12 +37,12 @@
     "gui_choose_items": "Escolher",
     "gui_share_start_server": "Começar a compartilhar",
     "gui_share_stop_server": "Parar de compartilhar",
-    "gui_share_stop_server_shutdown_timeout": "Parar de compartilhar  ({}segundos para terminar)",
-    "gui_share_stop_server_shutdown_timeout_tooltip": "O cronômetro automático termina às",
+    "gui_share_stop_server_autostop_timer": "Parar de compartilhar  ({}segundos para terminar)",
+    "gui_share_stop_server_autostop_timer_tooltip": "O cronômetro automático termina às",
     "gui_receive_start_server": "Modo Começar a Receber",
     "gui_receive_stop_server": "Modo Parar de Receber",
-    "gui_receive_stop_server_shutdown_timeout": "Modo Parar de Receber ({}segundos para terminar)",
-    "gui_receive_stop_server_shutdown_timeout_tooltip": "O cronômetro automático termina às {}",
+    "gui_receive_stop_server_autostop_timer": "Modo Parar de Receber ({}segundos para terminar)",
+    "gui_receive_stop_server_autostop_timer_tooltip": "O cronômetro automático termina às {}",
     "gui_copy_url": "Copiar endereço",
     "gui_copy_hidservauth": "Copiar HidServAuth",
     "gui_downloads": "Histórico de download",
@@ -104,8 +104,8 @@
     "gui_settings_button_save": "Salvar",
     "gui_settings_button_cancel": "Cancelar",
     "gui_settings_button_help": "Ajuda",
-    "gui_settings_shutdown_timeout_checkbox": "Usar cronômetro para encerrar automaticamente",
-    "gui_settings_shutdown_timeout": "Encerrar o compartilhamento às:",
+    "gui_settings_autostop_timer_checkbox": "Usar cronômetro para encerrar automaticamente",
+    "gui_settings_autostop_timer": "Encerrar o compartilhamento às:",
     "settings_error_unknown": "Impossível conectar-se ao controlador do Tor, porque as suas configurações estão confusas.",
     "settings_error_automatic": "Não foi possível conectar ao controlador do Tor. O Navegador Tor (disponível no site torproject.org) está rodando em segundo plano?",
     "settings_error_socket_port": "Não pode ligar ao controlador do Tor em {}:{}.",
@@ -131,8 +131,8 @@
     "gui_tor_connection_error_settings": "Tente mudar nas configurações a forma como OnionShare se conecta à rede Tor.",
     "gui_tor_connection_canceled": "Não foi possível conectar à rede Tor.\n\nVerifique se você está conectada à Internet, e então abra OnionShare novamente e configure sua conexão à rede Tor.",
     "gui_tor_connection_lost": "Desconectado do Tor.",
-    "gui_server_started_after_timeout": "O tempo esgotou antes do servidor iniciar.\nPor favor, crie um novo compartilhamento.",
-    "gui_server_timeout_expired": "O temporizador já esgotou.\nPor favor, atualize-o antes de começar a compartilhar.",
+    "gui_server_started_after_autostop_timer": "O tempo esgotou antes do servidor iniciar.\nPor favor, crie um novo compartilhamento.",
+    "gui_server_autostop_timer_expired": "O temporizador já esgotou.\nPor favor, atualize-o antes de começar a compartilhar.",
     "share_via_onionshare": "Compartilhar usando OnionShare",
     "gui_use_legacy_v2_onions_checkbox": "Usar endereços do tipo antigo",
     "gui_save_private_key_checkbox": "Usar o mesmo endereço",
@@ -206,9 +206,9 @@
     "gui_all_modes_transfer_finished": "Transferido {}",
     "gui_all_modes_transfer_canceled_range": "Cancelado {} - {}",
     "gui_all_modes_transfer_canceled": "Cancelado {}",
-    "gui_share_mode_timeout_waiting": "Esperando para completar o envio",
+    "gui_share_mode_autostop_timer_waiting": "Esperando para completar o envio",
     "gui_receive_mode_no_files": "Nenhum arquivo recebido",
-    "gui_receive_mode_timeout_waiting": "Esperando para completar o recebimento",
+    "gui_receive_mode_autostop_timer_waiting": "Esperando para completar o recebimento",
     "gui_settings_onion_label": "Configurando Onion",
     "systray_page_loaded_message": "Endereço OnionShare foi carregado",
     "gui_all_modes_progress_complete": "%p%, {0:s} em curso.",
diff --git a/share/locale/pt_PT.json b/share/locale/pt_PT.json
index e1c9fb54..5e3b81f8 100644
--- a/share/locale/pt_PT.json
+++ b/share/locale/pt_PT.json
@@ -10,7 +10,7 @@
     "not_a_readable_file": "",
     "no_available_port": "",
     "other_page_loaded": "Outra página tem sido carregada",
-    "close_on_timeout": "",
+    "close_on_autostop_timer": "",
     "closing_automatically": "",
     "timeout_download_still_running": "",
     "large_filesize": "",
@@ -37,12 +37,12 @@
     "gui_choose_items": "Escolha",
     "gui_share_start_server": "",
     "gui_share_stop_server": "",
-    "gui_share_stop_server_shutdown_timeout": "",
-    "gui_share_stop_server_shutdown_timeout_tooltip": "",
+    "gui_share_stop_server_autostop_timer": "",
+    "gui_share_stop_server_autostop_timer_tooltip": "",
     "gui_receive_start_server": "",
     "gui_receive_stop_server": "",
-    "gui_receive_stop_server_shutdown_timeout": "",
-    "gui_receive_stop_server_shutdown_timeout_tooltip": "",
+    "gui_receive_stop_server_autostop_timer": "",
+    "gui_receive_stop_server_autostop_timer_tooltip": "",
     "gui_copy_url": "",
     "gui_copy_hidservauth": "",
     "gui_downloads": "",
@@ -104,8 +104,8 @@
     "gui_settings_button_save": "",
     "gui_settings_button_cancel": "Cancelar",
     "gui_settings_button_help": "Ajuda",
-    "gui_settings_shutdown_timeout_checkbox": "",
-    "gui_settings_shutdown_timeout": "",
+    "gui_settings_autostop_timer_checkbox": "",
+    "gui_settings_autostop_timer": "",
     "settings_error_unknown": "",
     "settings_error_automatic": "",
     "settings_error_socket_port": "",
@@ -131,8 +131,8 @@
     "gui_tor_connection_error_settings": "",
     "gui_tor_connection_canceled": "",
     "gui_tor_connection_lost": "",
-    "gui_server_started_after_timeout": "",
-    "gui_server_timeout_expired": "",
+    "gui_server_started_after_autostop_timer": "",
+    "gui_server_autostop_timer_expired": "",
     "share_via_onionshare": "",
     "gui_use_legacy_v2_onions_checkbox": "",
     "gui_save_private_key_checkbox": "",
diff --git a/share/locale/ro.json b/share/locale/ro.json
index 08446de1..f176d374 100644
--- a/share/locale/ro.json
+++ b/share/locale/ro.json
@@ -10,7 +10,7 @@
     "not_a_readable_file": "",
     "no_available_port": "",
     "other_page_loaded": "",
-    "close_on_timeout": "",
+    "close_on_autostop_timer": "",
     "closing_automatically": "",
     "timeout_download_still_running": "",
     "large_filesize": "",
@@ -37,12 +37,12 @@
     "gui_choose_items": "Alegeți",
     "gui_share_start_server": "",
     "gui_share_stop_server": "",
-    "gui_share_stop_server_shutdown_timeout": "",
-    "gui_share_stop_server_shutdown_timeout_tooltip": "",
+    "gui_share_stop_server_autostop_timer": "",
+    "gui_share_stop_server_autostop_timer_tooltip": "",
     "gui_receive_start_server": "",
     "gui_receive_stop_server": "",
-    "gui_receive_stop_server_shutdown_timeout": "",
-    "gui_receive_stop_server_shutdown_timeout_tooltip": "",
+    "gui_receive_stop_server_autostop_timer": "",
+    "gui_receive_stop_server_autostop_timer_tooltip": "",
     "gui_copy_url": "",
     "gui_copy_hidservauth": "",
     "gui_downloads": "",
@@ -104,8 +104,8 @@
     "gui_settings_button_save": "Salvare",
     "gui_settings_button_cancel": "Anulare",
     "gui_settings_button_help": "Ajutor",
-    "gui_settings_shutdown_timeout_checkbox": "",
-    "gui_settings_shutdown_timeout": "",
+    "gui_settings_autostop_timer_checkbox": "",
+    "gui_settings_autostop_timer": "",
     "settings_error_unknown": "",
     "settings_error_automatic": "",
     "settings_error_socket_port": "",
@@ -131,8 +131,8 @@
     "gui_tor_connection_error_settings": "",
     "gui_tor_connection_canceled": "",
     "gui_tor_connection_lost": "",
-    "gui_server_started_after_timeout": "",
-    "gui_server_timeout_expired": "",
+    "gui_server_started_after_autostop_timer": "",
+    "gui_server_autostop_timer_expired": "",
     "share_via_onionshare": "",
     "gui_use_legacy_v2_onions_checkbox": "",
     "gui_save_private_key_checkbox": "",
diff --git a/share/locale/ru.json b/share/locale/ru.json
index 772e1e46..54aa66a0 100644
--- a/share/locale/ru.json
+++ b/share/locale/ru.json
@@ -36,7 +36,7 @@
     "give_this_url_receive_stealth": "Передайте этот адрес и строку HidServAuth отправителю:",
     "not_a_readable_file": "{0:s} не читаемый файл.",
     "no_available_port": "Не удалось найти доступный порт для запуска \"лукового\" сервиса",
-    "close_on_timeout": "Время ожидания таймера истекло, сервис остановлен",
+    "close_on_autostop_timer": "Время ожидания таймера истекло, сервис остановлен",
     "closing_automatically": "Загрузка завершена, сервис остановлен",
     "timeout_download_still_running": "Ожидаем завершения скачивания",
     "timeout_upload_still_running": "Ожидаем завершения загрузки",
@@ -60,12 +60,12 @@
     "gui_drag_and_drop": "Перетащите сюда файлы и/или папки,\nкоторые хотите отправить.",
     "gui_share_start_server": "Начать отправку",
     "gui_share_stop_server": "Закончить отправку",
-    "gui_share_stop_server_shutdown_timeout": "Остановить отправку (осталось {}с)",
-    "gui_share_stop_server_shutdown_timeout_tooltip": "Время таймера истекает в {}",
+    "gui_share_stop_server_autostop_timer": "Остановить отправку (осталось {}с)",
+    "gui_share_stop_server_autostop_timer_tooltip": "Время таймера истекает в {}",
     "gui_receive_start_server": "Включить режим получения",
     "gui_receive_stop_server": "Выключить режим получения",
-    "gui_receive_stop_server_shutdown_timeout": "Выключить режим получения (осталось {}с)",
-    "gui_receive_stop_server_shutdown_timeout_tooltip": "Время таймера истекает в {}",
+    "gui_receive_stop_server_autostop_timer": "Выключить режим получения (осталось {}с)",
+    "gui_receive_stop_server_autostop_timer_tooltip": "Время таймера истекает в {}",
     "gui_copy_hidservauth": "Скопировать строку HidServAuth",
     "gui_downloads": "История скачиваний",
     "gui_no_downloads": "Скачиваний пока нет ",
@@ -113,8 +113,8 @@
     "gui_settings_tor_bridges_custom_radio_option": "Использовать пользовательские \"мосты\"",
     "gui_settings_tor_bridges_custom_label": "Получить настройки \"мостов\" можно здесь: <a href=\"https://bridges.torproject.org/options\">https://bridges.torproject.org</a>",
     "gui_settings_tor_bridges_invalid": "Ни один из добавленных вами \"мостов\" не работает.\nПроверьте их снова или добавьте другие.",
-    "gui_settings_shutdown_timeout_checkbox": "Использовать таймер",
-    "gui_settings_shutdown_timeout": "Остановить загрузку в:",
+    "gui_settings_autostop_timer_checkbox": "Использовать таймер",
+    "gui_settings_autostop_timer": "Остановить загрузку в:",
     "settings_error_unknown": "Невозможно произвести подключение к контроллеру Tor: некорректные настройки.",
     "settings_error_automatic": "Ошибка подключения к контроллеру Tor. Запущен ли Tor Browser (torproject.org) в фоновом режиме?",
     "settings_error_socket_port": "Ошибка подключения к контроллеру Tor в {}:{}.",
@@ -138,8 +138,8 @@
     "gui_tor_connection_error_settings": "Попробуйте изменить способ подключения OnionShare к сети Tor в разделе \"Настройки\".",
     "gui_tor_connection_canceled": "Ошибка подключения к Tor.\n\nПожалуйста, убедитесь что подключены к сети Интернет. Откройте OnionShare снова и настройте подключение к Tor.",
     "gui_tor_connection_lost": "Отключено от Tor.",
-    "gui_server_started_after_timeout": "Время таймера истекло до того, как сервер был запущен.\nПожалуйста, отправьте файлы заново.",
-    "gui_server_timeout_expired": "Время таймера истекло.\nПожалуйста, обновите его для начала отправки.",
+    "gui_server_started_after_autostop_timer": "Время таймера истекло до того, как сервер был запущен.\nПожалуйста, отправьте файлы заново.",
+    "gui_server_autostop_timer_expired": "Время таймера истекло.\nПожалуйста, обновите его для начала отправки.",
     "share_via_onionshare": "OnionShare это",
     "gui_use_legacy_v2_onions_checkbox": "Используйте устаревшие адреса",
     "gui_save_private_key_checkbox": "Используйте постоянный адрес",
@@ -210,7 +210,7 @@
     "gui_all_modes_progress_starting": "{0:s}, %p% (вычисляем)",
     "gui_all_modes_progress_eta": "{0:s}, ETA: {1:s}, %p%",
     "gui_share_mode_no_files": "Пока нет отправленных файлов",
-    "gui_share_mode_timeout_waiting": "Ожидается завершение отправки",
+    "gui_share_mode_autostop_timer_waiting": "Ожидается завершение отправки",
     "gui_receive_mode_no_files": "Пока нет полученных файлов",
-    "gui_receive_mode_timeout_waiting": "Ожидается завершение загрузки"
+    "gui_receive_mode_autostop_timer_waiting": "Ожидается завершение загрузки"
 }
diff --git a/share/locale/sl.json b/share/locale/sl.json
index bb79b972..3fd265f6 100644
--- a/share/locale/sl.json
+++ b/share/locale/sl.json
@@ -10,7 +10,7 @@
     "not_a_readable_file": "",
     "no_available_port": "",
     "other_page_loaded": "",
-    "close_on_timeout": "",
+    "close_on_autostop_timer": "",
     "closing_automatically": "",
     "timeout_download_still_running": "",
     "large_filesize": "",
@@ -37,12 +37,12 @@
     "gui_choose_items": "Izberi",
     "gui_share_start_server": "",
     "gui_share_stop_server": "",
-    "gui_share_stop_server_shutdown_timeout": "",
-    "gui_share_stop_server_shutdown_timeout_tooltip": "",
+    "gui_share_stop_server_autostop_timer": "",
+    "gui_share_stop_server_autostop_timer_tooltip": "",
     "gui_receive_start_server": "",
     "gui_receive_stop_server": "",
-    "gui_receive_stop_server_shutdown_timeout": "",
-    "gui_receive_stop_server_shutdown_timeout_tooltip": "",
+    "gui_receive_stop_server_autostop_timer": "",
+    "gui_receive_stop_server_autostop_timer_tooltip": "",
     "gui_copy_url": "",
     "gui_copy_hidservauth": "",
     "gui_downloads": "",
@@ -104,8 +104,8 @@
     "gui_settings_button_save": "",
     "gui_settings_button_cancel": "",
     "gui_settings_button_help": "Pomoč",
-    "gui_settings_shutdown_timeout_checkbox": "",
-    "gui_settings_shutdown_timeout": "",
+    "gui_settings_autostop_timer_checkbox": "",
+    "gui_settings_autostop_timer": "",
     "settings_error_unknown": "",
     "settings_error_automatic": "",
     "settings_error_socket_port": "",
@@ -131,8 +131,8 @@
     "gui_tor_connection_error_settings": "",
     "gui_tor_connection_canceled": "",
     "gui_tor_connection_lost": "",
-    "gui_server_started_after_timeout": "",
-    "gui_server_timeout_expired": "",
+    "gui_server_started_after_autostop_timer": "",
+    "gui_server_autostop_timer_expired": "",
     "share_via_onionshare": "",
     "gui_use_legacy_v2_onions_checkbox": "",
     "gui_save_private_key_checkbox": "",
diff --git a/share/locale/sn.json b/share/locale/sn.json
index ed49ba55..ecc7755f 100644
--- a/share/locale/sn.json
+++ b/share/locale/sn.json
@@ -10,7 +10,7 @@
     "not_a_readable_file": "",
     "no_available_port": "",
     "other_page_loaded": "",
-    "close_on_timeout": "",
+    "close_on_autostop_timer": "",
     "closing_automatically": "",
     "timeout_download_still_running": "",
     "timeout_upload_still_running": "",
@@ -40,12 +40,12 @@
     "gui_choose_items": "",
     "gui_share_start_server": "",
     "gui_share_stop_server": "",
-    "gui_share_stop_server_shutdown_timeout": "",
-    "gui_share_stop_server_shutdown_timeout_tooltip": "",
+    "gui_share_stop_server_autostop_timer": "",
+    "gui_share_stop_server_autostop_timer_tooltip": "",
     "gui_receive_start_server": "",
     "gui_receive_stop_server": "",
-    "gui_receive_stop_server_shutdown_timeout": "",
-    "gui_receive_stop_server_shutdown_timeout_tooltip": "",
+    "gui_receive_stop_server_autostop_timer": "",
+    "gui_receive_stop_server_autostop_timer_tooltip": "",
     "gui_copy_url": "",
     "gui_copy_hidservauth": "",
     "gui_downloads": "",
@@ -107,8 +107,8 @@
     "gui_settings_button_save": "",
     "gui_settings_button_cancel": "",
     "gui_settings_button_help": "",
-    "gui_settings_shutdown_timeout_checkbox": "",
-    "gui_settings_shutdown_timeout": "",
+    "gui_settings_autostop_timer_checkbox": "",
+    "gui_settings_autostop_timer": "",
     "settings_error_unknown": "",
     "settings_error_automatic": "",
     "settings_error_socket_port": "",
@@ -134,8 +134,8 @@
     "gui_tor_connection_error_settings": "",
     "gui_tor_connection_canceled": "",
     "gui_tor_connection_lost": "",
-    "gui_server_started_after_timeout": "",
-    "gui_server_timeout_expired": "",
+    "gui_server_started_after_autostop_timer": "",
+    "gui_server_autostop_timer_expired": "",
     "share_via_onionshare": "",
     "gui_connect_to_tor_for_onion_settings": "",
     "gui_use_legacy_v2_onions_checkbox": "",
diff --git a/share/locale/sv.json b/share/locale/sv.json
index 53e05e43..3b2254a5 100644
--- a/share/locale/sv.json
+++ b/share/locale/sv.json
@@ -10,7 +10,7 @@
     "not_a_readable_file": "{0:s} är inte en läsbar fil.",
     "no_available_port": "Kunde inte hitta en ledig kort för att starta onion-tjänsten",
     "other_page_loaded": "Adress laddad",
-    "close_on_timeout": "Stoppad för att tiden för den automatiska stopp-tidtagaren löpte ut",
+    "close_on_autostop_timer": "Stoppad för att tiden för den automatiska stopp-tidtagaren löpte ut",
     "closing_automatically": "Stoppad för att hämtningen är klar",
     "timeout_download_still_running": "Väntar på att nedladdningen ska bli klar",
     "timeout_upload_still_running": "Väntar på att uppladdningen ska bli klar",
@@ -38,12 +38,12 @@
     "gui_choose_items": "Välj",
     "gui_share_start_server": "Börja dela",
     "gui_share_stop_server": "Avbryt delning",
-    "gui_share_stop_server_shutdown_timeout": "Avbryt Delning ({}s kvarstår)",
-    "gui_share_stop_server_shutdown_timeout_tooltip": "Automatiska stopp-tidtagaren avslutar vid {}",
+    "gui_share_stop_server_autostop_timer": "Avbryt Delning ({}s kvarstår)",
+    "gui_share_stop_server_autostop_timer_tooltip": "Automatiska stopp-tidtagaren avslutar vid {}",
     "gui_receive_start_server": "Starta mottagarläge",
     "gui_receive_stop_server": "Avsluta Mottagarläge",
-    "gui_receive_stop_server_shutdown_timeout": "Avsluta Mottagarläge ({}s kvarstår)",
-    "gui_receive_stop_server_shutdown_timeout_tooltip": "Automatiska stopp-tidtagaren avslutar vid {}",
+    "gui_receive_stop_server_autostop_timer": "Avsluta Mottagarläge ({}s kvarstår)",
+    "gui_receive_stop_server_autostop_timer_tooltip": "Automatiska stopp-tidtagaren avslutar vid {}",
     "gui_copy_url": "Kopiera Adress",
     "gui_copy_hidservauth": "Kopiera HidServAuth",
     "gui_downloads": "Nedladdningshistorik",
@@ -105,8 +105,8 @@
     "gui_settings_button_save": "Spara",
     "gui_settings_button_cancel": "Avbryt",
     "gui_settings_button_help": "Hjälp",
-    "gui_settings_shutdown_timeout_checkbox": "Använd den automatiska stopp-tidtagaren",
-    "gui_settings_shutdown_timeout": "Stoppa delningen vid:",
+    "gui_settings_autostop_timer_checkbox": "Använd den automatiska stopp-tidtagaren",
+    "gui_settings_autostop_timer": "Stoppa delningen vid:",
     "settings_error_unknown": "Kan inte ansluta till Tor-regulatorn eftersom dina inställningar inte är vettiga.",
     "settings_error_automatic": "Kunde inte ansluta till Tor-regulatorn. Körs Tor Browser (tillgänglig från torproject.org) i bakgrunden?",
     "settings_error_socket_port": "Det går inte att ansluta till Tor-regulatorn på {}:{}.",
@@ -132,8 +132,8 @@
     "gui_tor_connection_error_settings": "Försök ändra hur OnionShare ansluter till Tor-nätverket i inställningarna.",
     "gui_tor_connection_canceled": "Kunde inte ansluta till Tor.\n\nSe till att du är ansluten till Internet, öppna sedan OnionShare och ställ in anslutningen till Tor.",
     "gui_tor_connection_lost": "Frånkopplad från Tor.",
-    "gui_server_started_after_timeout": "Tiden för den automatiska stopp-timern löpte ut innan servern startade.\nVänligen gör en ny delning.",
-    "gui_server_timeout_expired": "Tiden för den automatiska stopp-tidtagaren löpte redan ut.\nUppdatera den för att börja dela.",
+    "gui_server_started_after_autostop_timer": "Tiden för den automatiska stopp-timern löpte ut innan servern startade.\nVänligen gör en ny delning.",
+    "gui_server_autostop_timer_expired": "Tiden för den automatiska stopp-tidtagaren löpte redan ut.\nUppdatera den för att börja dela.",
     "share_via_onionshare": "Dela den med OnionShare",
     "gui_use_legacy_v2_onions_checkbox": "Använd äldre adresser",
     "gui_save_private_key_checkbox": "Använd en beständig adress",
@@ -207,9 +207,9 @@
     "gui_all_modes_progress_starting": "{0} %s% (beräkning)",
     "gui_all_modes_progress_eta": "{0:s}, ETA: {1:s}, %p%",
     "gui_share_mode_no_files": "Inga filer har skickats än",
-    "gui_share_mode_timeout_waiting": "Väntar på att avsluta sändningen",
+    "gui_share_mode_autostop_timer_waiting": "Väntar på att avsluta sändningen",
     "gui_receive_mode_no_files": "Inga filer har mottagits ännu",
-    "gui_receive_mode_timeout_waiting": "Väntar på att avsluta mottagande",
+    "gui_receive_mode_autostop_timer_waiting": "Väntar på att avsluta mottagande",
     "gui_all_modes_transfer_canceled_range": "Avbröt {} - {}",
     "gui_all_modes_transfer_canceled": "Avbröt {}",
     "gui_settings_onion_label": "Inställningar för Onion"
diff --git a/share/locale/tr.json b/share/locale/tr.json
index a5f5b429..7e9832e0 100644
--- a/share/locale/tr.json
+++ b/share/locale/tr.json
@@ -26,5 +26,5 @@
     "give_this_url_receive": "Bu adresi gönderene ver:",
     "not_a_readable_file": "{0:s} okunabilir bir dosya değil.",
     "no_available_port": "Onion servisini başlatmak için uygun bir port bulunamadı",
-    "close_on_timeout": "Otomatik durma zamanlayıcısının bitmesi nedeniyle durdu"
+    "close_on_autostop_timer": "Otomatik durma zamanlayıcısının bitmesi nedeniyle durdu"
 }
diff --git a/share/locale/wo.json b/share/locale/wo.json
index f39e1af7..1d60545f 100644
--- a/share/locale/wo.json
+++ b/share/locale/wo.json
@@ -10,7 +10,7 @@
     "not_a_readable_file": "",
     "no_available_port": "",
     "other_page_loaded": "",
-    "close_on_timeout": "",
+    "close_on_autostop_timer": "",
     "closing_automatically": "",
     "timeout_download_still_running": "",
     "large_filesize": "",
@@ -37,12 +37,12 @@
     "gui_choose_items": "",
     "gui_share_start_server": "",
     "gui_share_stop_server": "",
-    "gui_share_stop_server_shutdown_timeout": "",
-    "gui_share_stop_server_shutdown_timeout_tooltip": "",
+    "gui_share_stop_server_autostop_timer": "",
+    "gui_share_stop_server_autostop_timer_tooltip": "",
     "gui_receive_start_server": "",
     "gui_receive_stop_server": "",
-    "gui_receive_stop_server_shutdown_timeout": "",
-    "gui_receive_stop_server_shutdown_timeout_tooltip": "",
+    "gui_receive_stop_server_autostop_timer": "",
+    "gui_receive_stop_server_autostop_timer_tooltip": "",
     "gui_copy_url": "",
     "gui_copy_hidservauth": "",
     "gui_downloads": "",
@@ -104,8 +104,8 @@
     "gui_settings_button_save": "",
     "gui_settings_button_cancel": "",
     "gui_settings_button_help": "",
-    "gui_settings_shutdown_timeout_checkbox": "",
-    "gui_settings_shutdown_timeout": "",
+    "gui_settings_autostop_timer_checkbox": "",
+    "gui_settings_autostop_timer": "",
     "settings_error_unknown": "",
     "settings_error_automatic": "",
     "settings_error_socket_port": "",
@@ -131,8 +131,8 @@
     "gui_tor_connection_error_settings": "",
     "gui_tor_connection_canceled": "",
     "gui_tor_connection_lost": "",
-    "gui_server_started_after_timeout": "",
-    "gui_server_timeout_expired": "",
+    "gui_server_started_after_autostop_timer": "",
+    "gui_server_autostop_timer_expired": "",
     "share_via_onionshare": "",
     "gui_use_legacy_v2_onions_checkbox": "",
     "gui_save_private_key_checkbox": "",
diff --git a/share/locale/yo.json b/share/locale/yo.json
index 8c1819bd..7dbce74b 100644
--- a/share/locale/yo.json
+++ b/share/locale/yo.json
@@ -10,7 +10,7 @@
     "not_a_readable_file": "",
     "no_available_port": "",
     "other_page_loaded": "",
-    "close_on_timeout": "",
+    "close_on_autostop_timer": "",
     "closing_automatically": "",
     "timeout_download_still_running": "",
     "timeout_upload_still_running": "",
@@ -38,12 +38,12 @@
     "gui_choose_items": "",
     "gui_share_start_server": "",
     "gui_share_stop_server": "",
-    "gui_share_stop_server_shutdown_timeout": "",
-    "gui_share_stop_server_shutdown_timeout_tooltip": "",
+    "gui_share_stop_server_autostop_timer": "",
+    "gui_share_stop_server_autostop_timer_tooltip": "",
     "gui_receive_start_server": "",
     "gui_receive_stop_server": "",
-    "gui_receive_stop_server_shutdown_timeout": "",
-    "gui_receive_stop_server_shutdown_timeout_tooltip": "",
+    "gui_receive_stop_server_autostop_timer": "",
+    "gui_receive_stop_server_autostop_timer_tooltip": "",
     "gui_copy_url": "",
     "gui_copy_hidservauth": "",
     "gui_downloads": "",
@@ -105,8 +105,8 @@
     "gui_settings_button_save": "",
     "gui_settings_button_cancel": "",
     "gui_settings_button_help": "",
-    "gui_settings_shutdown_timeout_checkbox": "",
-    "gui_settings_shutdown_timeout": "",
+    "gui_settings_autostop_timer_checkbox": "",
+    "gui_settings_autostop_timer": "",
     "settings_error_unknown": "",
     "settings_error_automatic": "",
     "settings_error_socket_port": "",
@@ -132,8 +132,8 @@
     "gui_tor_connection_error_settings": "",
     "gui_tor_connection_canceled": "",
     "gui_tor_connection_lost": "",
-    "gui_server_started_after_timeout": "",
-    "gui_server_timeout_expired": "",
+    "gui_server_started_after_autostop_timer": "",
+    "gui_server_autostop_timer_expired": "",
     "share_via_onionshare": "",
     "gui_use_legacy_v2_onions_checkbox": "",
     "gui_save_private_key_checkbox": "",
diff --git a/share/locale/zh_Hans.json b/share/locale/zh_Hans.json
index 31f25f08..1c71fafe 100644
--- a/share/locale/zh_Hans.json
+++ b/share/locale/zh_Hans.json
@@ -10,7 +10,7 @@
     "not_a_readable_file": "{0:s}不是可读文件.",
     "no_available_port": "找不到可用于开启onion服务的端口",
     "other_page_loaded": "地址已加载完成",
-    "close_on_timeout": "停止原因：自动停止计时器的时间已到",
+    "close_on_autostop_timer": "停止原因：自动停止计时器的时间已到",
     "closing_automatically": "终止 原因:传输已完成",
     "timeout_download_still_running": "",
     "large_filesize": "警告:分享大文件可能会用上数小时",
@@ -37,12 +37,12 @@
     "gui_choose_items": "选取",
     "gui_share_start_server": "开始分享",
     "gui_share_stop_server": "停止分享",
-    "gui_share_stop_server_shutdown_timeout": "停止分享（还剩{}秒）",
-    "gui_share_stop_server_shutdown_timeout_tooltip": "在{}自动停止",
+    "gui_share_stop_server_autostop_timer": "停止分享（还剩{}秒）",
+    "gui_share_stop_server_autostop_timer_tooltip": "在{}自动停止",
     "gui_receive_start_server": "开启接受模式",
     "gui_receive_stop_server": "停止接受模式",
-    "gui_receive_stop_server_shutdown_timeout": "停止接受模式(还剩{}秒)",
-    "gui_receive_stop_server_shutdown_timeout_tooltip": "在{}自动停止",
+    "gui_receive_stop_server_autostop_timer": "停止接受模式(还剩{}秒)",
+    "gui_receive_stop_server_autostop_timer_tooltip": "在{}自动停止",
     "gui_copy_url": "复制地址",
     "gui_copy_hidservauth": "复制HidServAuth",
     "gui_downloads": "",
@@ -104,8 +104,8 @@
     "gui_settings_button_save": "保存",
     "gui_settings_button_cancel": "取消",
     "gui_settings_button_help": "帮助",
-    "gui_settings_shutdown_timeout_checkbox": "使用自动停止计时器",
-    "gui_settings_shutdown_timeout": "停止分享时间：",
+    "gui_settings_autostop_timer_checkbox": "使用自动停止计时器",
+    "gui_settings_autostop_timer": "停止分享时间：",
     "settings_error_unknown": "无法连接Tor控制件，因为您的设置无法被理解.",
     "settings_error_automatic": "无法连接tor控制件.Tor浏览器是否在后台工作？(从torproject.org可以获得Tor Browser)",
     "settings_error_socket_port": "在socket端口{}:{}无法连接tor控制件.",
@@ -131,8 +131,8 @@
     "gui_tor_connection_error_settings": "请尝试在设置中设定OnionShare连接Tor的方式.",
     "gui_tor_connection_canceled": "无法连接Tor。\n\n请确保您一连接到网络，然后重启OnionShare并设置Tor连接。",
     "gui_tor_connection_lost": "已和Tor断开连接.",
-    "gui_server_started_after_timeout": "在服务开始之前自动停止计时器的时间已到.\n请建立新的分享.",
-    "gui_server_timeout_expired": "自动停止计时器的时间已到。\n请更新其设置来开始分享。",
+    "gui_server_started_after_autostop_timer": "在服务开始之前自动停止计时器的时间已到.\n请建立新的分享.",
+    "gui_server_autostop_timer_expired": "自动停止计时器的时间已到。\n请更新其设置来开始分享。",
     "share_via_onionshare": "用OnionShare来分享",
     "gui_use_legacy_v2_onions_checkbox": "使用旧的地址",
     "gui_save_private_key_checkbox": "使用长期地址",
@@ -207,9 +207,9 @@
     "gui_all_modes_progress_starting": "{0:s}, %p% (计算中)",
     "gui_all_modes_progress_eta": "{0:s}, 预计完成时间: {1:s}, %p%",
     "gui_share_mode_no_files": "还没有文件发出",
-    "gui_share_mode_timeout_waiting": "等待结束发送",
+    "gui_share_mode_autostop_timer_waiting": "等待结束发送",
     "gui_receive_mode_no_files": "还没有接收文件",
-    "gui_receive_mode_timeout_waiting": "等待接收完成",
+    "gui_receive_mode_autostop_timer_waiting": "等待接收完成",
     "gui_settings_onion_label": "Onion设置",
     "gui_all_modes_transfer_canceled_range": "已取消 {} - {}",
     "gui_all_modes_transfer_canceled": "已取消 {}"
diff --git a/share/locale/zh_Hant.json b/share/locale/zh_Hant.json
index de34880c..032ed353 100644
--- a/share/locale/zh_Hant.json
+++ b/share/locale/zh_Hant.json
@@ -10,7 +10,7 @@
     "not_a_readable_file": "{0:s} 不是一個可讀取的檔案。",
     "no_available_port": "找不到一個可用的端口來啟動onion服務",
     "other_page_loaded": "已載入的地址",
-    "close_on_timeout": "因計數器超時，已停止",
+    "close_on_autostop_timer": "因計數器超時，已停止",
     "closing_automatically": "因傳輸完成，已停止",
     "timeout_download_still_running": "",
     "large_filesize": "警告:傳輸巨大的檔案將有可能耗時數小時以上",
@@ -37,12 +37,12 @@
     "gui_choose_items": "瀏覽",
     "gui_share_start_server": "開始分享",
     "gui_share_stop_server": "停止分享",
-    "gui_share_stop_server_shutdown_timeout": "停止分享 (剩餘{}秒)",
-    "gui_share_stop_server_shutdown_timeout_tooltip": "計數器將在{}停止",
+    "gui_share_stop_server_autostop_timer": "停止分享 (剩餘{}秒)",
+    "gui_share_stop_server_autostop_timer_tooltip": "計數器將在{}停止",
     "gui_receive_start_server": "啟動接收模式",
     "gui_receive_stop_server": "停止接收模式",
-    "gui_receive_stop_server_shutdown_timeout": "停止接收模式 (剩餘{}秒)",
-    "gui_receive_stop_server_shutdown_timeout_tooltip": "計數器將在{}停止",
+    "gui_receive_stop_server_autostop_timer": "停止接收模式 (剩餘{}秒)",
+    "gui_receive_stop_server_autostop_timer_tooltip": "計數器將在{}停止",
     "gui_copy_url": "複製地址",
     "gui_copy_hidservauth": "複製HidServAuth",
     "gui_downloads": "",
@@ -104,8 +104,8 @@
     "gui_settings_button_save": "保存",
     "gui_settings_button_cancel": "取消",
     "gui_settings_button_help": "說明",
-    "gui_settings_shutdown_timeout_checkbox": "使用自動停止計數器",
-    "gui_settings_shutdown_timeout": "在這個時間停止分享:",
+    "gui_settings_autostop_timer_checkbox": "使用自動停止計數器",
+    "gui_settings_autostop_timer": "在這個時間停止分享:",
     "settings_error_unknown": "無法連接到Tor controller因為您的設定無效。",
     "settings_error_automatic": "無法連機到Tor controller。Tor Browser(可以從torproject.org取得)是否正在背景運行?",
     "settings_error_socket_port": "無法在{}:{}連接到Tor controller。",
@@ -131,8 +131,8 @@
     "gui_tor_connection_error_settings": "試試在設定中改變OnionShare連接到Tor網路的方式。",
     "gui_tor_connection_canceled": "無法連接到Tor。\n\n請確認您已連接上網路，然後再重新開啟OnionShare並設定Tor連線。",
     "gui_tor_connection_lost": "已斷開Tor連接。",
-    "gui_server_started_after_timeout": "",
-    "gui_server_timeout_expired": "",
+    "gui_server_started_after_autostop_timer": "",
+    "gui_server_autostop_timer_expired": "",
     "share_via_onionshare": "",
     "gui_use_legacy_v2_onions_checkbox": "",
     "gui_save_private_key_checkbox": "",
diff --git a/tests/GuiBaseTest.py b/tests/GuiBaseTest.py
index 9ff0477f..ec8dc870 100644
--- a/tests/GuiBaseTest.py
+++ b/tests/GuiBaseTest.py
@@ -294,12 +294,12 @@ class GuiBaseTest(object):
     def set_timeout(self, mode, timeout):
         '''Test that the timeout can be set'''
         timer = QtCore.QDateTime.currentDateTime().addSecs(timeout)
-        mode.server_status.shutdown_timeout.setDateTime(timer)
-        self.assertTrue(mode.server_status.shutdown_timeout.dateTime(), timer)
+        mode.server_status.autostop_timer_widget.setDateTime(timer)
+        self.assertTrue(mode.server_status.autostop_timer_widget.dateTime(), timer)
 
-    def timeout_widget_hidden(self, mode):
-        '''Test that the timeout widget is hidden when share has started'''
-        self.assertFalse(mode.server_status.shutdown_timeout_container.isVisible())
+    def autostop_timer_widget_hidden(self, mode):
+        '''Test that the auto-stop timer widget is hidden when share has started'''
+        self.assertFalse(mode.server_status.autostop_timer_container.isVisible())
 
 
     def server_timed_out(self, mode, wait):
diff --git a/tests/GuiReceiveTest.py b/tests/GuiReceiveTest.py
index d1581c8e..40c3de95 100644
--- a/tests/GuiReceiveTest.py
+++ b/tests/GuiReceiveTest.py
@@ -139,6 +139,6 @@ class GuiReceiveTest(GuiBaseTest):
         """Auto-stop timer tests in receive mode"""
         self.run_all_receive_mode_setup_tests(public_mode)
         self.set_timeout(self.gui.receive_mode, 5)
-        self.timeout_widget_hidden(self.gui.receive_mode)
+        self.autostop_timer_widget_hidden(self.gui.receive_mode)
         self.server_timed_out(self.gui.receive_mode, 15000)
         self.web_server_is_stopped()
diff --git a/tests/GuiShareTest.py b/tests/GuiShareTest.py
index e8b31451..d25c6c34 100644
--- a/tests/GuiShareTest.py
+++ b/tests/GuiShareTest.py
@@ -191,7 +191,7 @@ class GuiShareTest(GuiBaseTest):
         self.run_all_share_mode_setup_tests()
         self.set_timeout(self.gui.share_mode, 5)
         self.run_all_share_mode_started_tests(public_mode)
-        self.timeout_widget_hidden(self.gui.share_mode)
+        self.autostop_timer_widget_hidden(self.gui.share_mode)
         self.server_timed_out(self.gui.share_mode, 10000)
         self.web_server_is_stopped()
 
@@ -206,7 +206,7 @@ class GuiShareTest(GuiBaseTest):
         self.scheduled_service_started(self.gui.share_mode, 7000)
         self.web_server_is_running()
 
-    def run_all_share_mode_startup_shutdown_mismatch_tests(self, public_mode):
+    def run_all_share_mode_autostop_autostart_mismatch_tests(self, public_mode):
         """Auto-stop timer tests in share mode"""
         self.run_all_share_mode_setup_tests()
         self.set_startup_timer(self.gui.share_mode, 15)
diff --git a/tests/SettingsGuiBaseTest.py b/tests/SettingsGuiBaseTest.py
index 844a0c86..35bdd9c6 100644
--- a/tests/SettingsGuiBaseTest.py
+++ b/tests/SettingsGuiBaseTest.py
@@ -77,11 +77,11 @@ class SettingsGuiBaseTest(object):
         QtTest.QTest.mouseClick(self.gui.public_mode_checkbox, QtCore.Qt.LeftButton, pos=QtCore.QPoint(2,self.gui.public_mode_checkbox.height()/2))
         self.assertTrue(self.gui.public_mode_checkbox.isChecked())
 
-        # shutdown timer is off
-        self.assertFalse(self.gui.shutdown_timeout_checkbox.isChecked())
-        # enable shutdown timer
-        QtTest.QTest.mouseClick(self.gui.shutdown_timeout_checkbox, QtCore.Qt.LeftButton, pos=QtCore.QPoint(2,self.gui.shutdown_timeout_checkbox.height()/2))
-        self.assertTrue(self.gui.shutdown_timeout_checkbox.isChecked())
+        # autostop timer is off
+        self.assertFalse(self.gui.autostop_timer_checkbox.isChecked())
+        # enable autostop timer
+        QtTest.QTest.mouseClick(self.gui.autostop_timer_checkbox, QtCore.Qt.LeftButton, pos=QtCore.QPoint(2,self.gui.autostop_timer_checkbox.height()/2))
+        self.assertTrue(self.gui.autostop_timer_checkbox.isChecked())
 
         # legacy mode checkbox and related widgets
         if self.gui.onion.is_authenticated():
@@ -222,7 +222,7 @@ class SettingsGuiBaseTest(object):
             data = json.load(f)
 
         self.assertTrue(data["public_mode"])
-        self.assertTrue(data["shutdown_timeout"])
+        self.assertTrue(data["autostop_timer"])
 
         if self.gui.onion.is_authenticated():
             if self.gui.onion.supports_v3_onions:
diff --git a/tests/TorGuiShareTest.py b/tests/TorGuiShareTest.py
index 53641dce..36efacd1 100644
--- a/tests/TorGuiShareTest.py
+++ b/tests/TorGuiShareTest.py
@@ -89,7 +89,7 @@ class TorGuiShareTest(TorGuiBaseTest, GuiShareTest):
         self.run_all_share_mode_setup_tests()
         self.set_timeout(self.gui.share_mode, 120)
         self.run_all_share_mode_started_tests(public_mode)
-        self.timeout_widget_hidden(self.gui.share_mode)
+        self.autostop_timer_widget_hidden(self.gui.share_mode)
         self.server_timed_out(self.gui.share_mode, 125000)
         self.web_server_is_stopped()
 
diff --git a/tests/local_onionshare_receive_mode_timer_test.py b/tests/local_onionshare_receive_mode_timer_test.py
index 0acaa4a9..6687d154 100644
--- a/tests/local_onionshare_receive_mode_timer_test.py
+++ b/tests/local_onionshare_receive_mode_timer_test.py
@@ -9,7 +9,7 @@ class LocalReceiveModeTimerTest(unittest.TestCase, GuiReceiveTest):
     def setUpClass(cls):
         test_settings = {
             "public_mode": False,
-            "shutdown_timeout": True,
+            "autostop_timer": True,
         }
         cls.gui = GuiReceiveTest.set_up(test_settings)
 
diff --git a/tests/local_onionshare_share_mode_startup_and_shutdown_timer_mismatch_test.py b/tests/local_onionshare_share_mode_autostart_and_autostop_timer_mismatch_test.py
index b3af8e17..2017e58d 100644
--- a/tests/local_onionshare_share_mode_startup_and_shutdown_timer_mismatch_test.py
+++ b/tests/local_onionshare_share_mode_autostart_and_autostop_timer_mismatch_test.py
@@ -10,7 +10,7 @@ class LocalShareModeStartupTimerTest(unittest.TestCase, GuiShareTest):
         test_settings = {
             "public_mode": False,
             "startup_timer": True,
-            "shutdown_timeout": True,
+            "autostop_timer": True,
         }
         cls.gui = GuiShareTest.set_up(test_settings)
 
@@ -21,7 +21,7 @@ class LocalShareModeStartupTimerTest(unittest.TestCase, GuiShareTest):
     @pytest.mark.gui
     def test_gui(self):
         self.run_all_common_setup_tests()
-        self.run_all_share_mode_startup_shutdown_mismatch_tests(False)
+        self.run_all_share_mode_autostop_autostart_mismatch_tests(False)
 
 if __name__ == "__main__":
     unittest.main()
diff --git a/tests/local_onionshare_share_mode_timer_test.py b/tests/local_onionshare_share_mode_timer_test.py
index e30ce4ec..ee47a07d 100644
--- a/tests/local_onionshare_share_mode_timer_test.py
+++ b/tests/local_onionshare_share_mode_timer_test.py
@@ -9,7 +9,7 @@ class LocalShareModeTimerTest(unittest.TestCase, GuiShareTest):
     def setUpClass(cls):
         test_settings = {
             "public_mode": False,
-            "shutdown_timeout": True,
+            "autostop_timer": True,
         }
         cls.gui = GuiShareTest.set_up(test_settings)
 
diff --git a/tests/local_onionshare_share_mode_timer_too_short_test.py b/tests/local_onionshare_share_mode_timer_too_short_test.py
index 8d22048d..fce895d3 100644
--- a/tests/local_onionshare_share_mode_timer_too_short_test.py
+++ b/tests/local_onionshare_share_mode_timer_too_short_test.py
@@ -10,7 +10,7 @@ class LocalShareModeTimerTooShortTest(unittest.TestCase, GuiShareTest):
     def setUpClass(cls):
         test_settings = {
             "public_mode": False,
-            "shutdown_timeout": True,
+            "autostop_timer": True,
         }
         cls.gui = GuiShareTest.set_up(test_settings)
 
diff --git a/tests/onionshare_share_mode_timer_test.py b/tests/onionshare_share_mode_timer_test.py
index 7f636a71..65ef1e38 100644
--- a/tests/onionshare_share_mode_timer_test.py
+++ b/tests/onionshare_share_mode_timer_test.py
@@ -9,7 +9,7 @@ class ShareModeTimerTest(unittest.TestCase, TorGuiShareTest):
     def setUpClass(cls):
         test_settings = {
             "public_mode": False,
-            "shutdown_timeout": True,
+            "autostop_timer": True,
         }
         cls.gui = TorGuiShareTest.set_up(test_settings)
 
diff --git a/tests/test_onionshare_settings.py b/tests/test_onionshare_settings.py
index 74ab4f8f..40eb9a0f 100644
--- a/tests/test_onionshare_settings.py
+++ b/tests/test_onionshare_settings.py
@@ -51,7 +51,7 @@ class TestSettings:
             'auth_type': 'no_auth',
             'auth_password': '',
             'close_after_first_download': True,
-            'shutdown_timeout': False,
+            'autostop_timer': False,
             'startup_timer': False,
             'use_stealth': False,
             'use_autoupdate': True,