diff --git a/data/etc/update-motd.d/50-freedombox b/data/etc/update-motd.d/50-freedombox
index e4567b798..759583578 100755
--- a/data/etc/update-motd.d/50-freedombox
+++ b/data/etc/update-motd.d/50-freedombox
@@ -14,5 +14,5 @@ cat <<"EOF"
 
 FreedomBox is a pure blend of Debian GNU/Linux. Web interface is available at
 https://localhost/ . FreedomBox manual is available in /usr/share/doc/freedombox
-and from the web interace.
+and from the web interface.
 EOF
diff --git a/debian/control b/debian/control
index 7b9292208..aab367b04 100644
--- a/debian/control
+++ b/debian/control
@@ -142,7 +142,7 @@ Recommends:
  openssh-client,
 # Priority: standard
  pciutils,
-# fuser, pstree and other utilites
+# fuser, pstree and other utilities
  psmisc,
 # Optional FreedomBox dependency
  python3-systemd,
diff --git a/doc/freedombox-manual.raw.xml b/doc/freedombox-manual.raw.xml
index d63ca77bb..781fb38ca 100644
--- a/doc/freedombox-manual.raw.xml
+++ b/doc/freedombox-manual.raw.xml
@@ -6871,7 +6871,7 @@ Password:
         </tgroup>
       </informaltable>
       <section>
-        <title>Hardware Comparision</title>
+        <title>Hardware Comparison</title>
         <informaltable>
           <tgroup cols="9">
             <colspec colname="col_0"/>
diff --git a/doc/plinth.xml b/doc/plinth.xml
index 33d53cc6c..925732597 100644
--- a/doc/plinth.xml
+++ b/doc/plinth.xml
@@ -180,7 +180,7 @@
   <refsect1>
     <title>Configuration</title>
     <para>
-      Plinth reads various configuraiton options from the file
+      Plinth reads various configuration options from the file
       <filename>/etc/plinth/plinth.config</filename>.  If this file is
       not present, then it reads configuration file
       <filename>./plinth.config</filename> from the current directory.
diff --git a/plinth/action_utils.py b/plinth/action_utils.py
index 0afbc8a00..93012f334 100644
--- a/plinth/action_utils.py
+++ b/plinth/action_utils.py
@@ -126,7 +126,7 @@ def service_reload(service_name):
 
 
 def service_action(service_name, action):
-    """Preform the given action on the service_name."""
+    """Perform the given action on the service_name."""
     if is_systemd_running():
         subprocess.run(['systemctl', action, service_name],
                        stdout=subprocess.DEVNULL)
@@ -222,7 +222,7 @@ class WebserverChange(object):
     def __exit__(self, exc_type, exc_value, traceback):
         """Restart or reload the webserver.
 
-        Don't supress exceptions.  If an exception occurs
+        Don't suppress exceptions.  If an exception occurs
         restart/reload the webserver based on enable/disable
         operations done so far.
         """
@@ -435,7 +435,7 @@ def diagnose_netcat(host, port, input='', negate=False):
 
 
 def get_addresses():
-    """Return a list of IP addreses and hostnames."""
+    """Return a list of IP addresses and hostnames."""
     addresses = get_ip_addresses()
 
     hostname = get_hostname()
diff --git a/plinth/locale/bg/LC_MESSAGES/django.po b/plinth/locale/bg/LC_MESSAGES/django.po
index 60086bcad..88b052c3d 100644
--- a/plinth/locale/bg/LC_MESSAGES/django.po
+++ b/plinth/locale/bg/LC_MESSAGES/django.po
@@ -828,7 +828,7 @@ msgid "Run Diagnostics"
 msgstr ""
 
 #: plinth/modules/diagnostics/templates/diagnostics.html:46
-msgid "Diagnotics test is currently running"
+msgid "Diagnostics test is currently running"
 msgstr ""
 
 #: plinth/modules/diagnostics/templates/diagnostics.html:59
diff --git a/plinth/locale/bn/LC_MESSAGES/django.po b/plinth/locale/bn/LC_MESSAGES/django.po
index f669b63d5..bde20186d 100644
--- a/plinth/locale/bn/LC_MESSAGES/django.po
+++ b/plinth/locale/bn/LC_MESSAGES/django.po
@@ -830,7 +830,7 @@ msgid "Run Diagnostics"
 msgstr ""
 
 #: plinth/modules/diagnostics/templates/diagnostics.html:46
-msgid "Diagnotics test is currently running"
+msgid "Diagnostics test is currently running"
 msgstr ""
 
 #: plinth/modules/diagnostics/templates/diagnostics.html:59
diff --git a/plinth/locale/cs/LC_MESSAGES/django.po b/plinth/locale/cs/LC_MESSAGES/django.po
index 63d5330e1..bdb95015a 100644
--- a/plinth/locale/cs/LC_MESSAGES/django.po
+++ b/plinth/locale/cs/LC_MESSAGES/django.po
@@ -920,7 +920,7 @@ msgid "Run Diagnostics"
 msgstr "Spustit diagnostiku"
 
 #: plinth/modules/diagnostics/templates/diagnostics.html:46
-msgid "Diagnotics test is currently running"
+msgid "Diagnostics test is currently running"
 msgstr "Diagnostické testy právě probíhají"
 
 #: plinth/modules/diagnostics/templates/diagnostics.html:59
diff --git a/plinth/locale/da/LC_MESSAGES/django.po b/plinth/locale/da/LC_MESSAGES/django.po
index ee6bcd2da..633cc1b5b 100644
--- a/plinth/locale/da/LC_MESSAGES/django.po
+++ b/plinth/locale/da/LC_MESSAGES/django.po
@@ -950,7 +950,7 @@ msgid "Run Diagnostics"
 msgstr "Kør Diagnostik"
 
 #: plinth/modules/diagnostics/templates/diagnostics.html:46
-msgid "Diagnotics test is currently running"
+msgid "Diagnostics test is currently running"
 msgstr "Diagnostisk test kører"
 
 #: plinth/modules/diagnostics/templates/diagnostics.html:59
diff --git a/plinth/locale/de/LC_MESSAGES/django.po b/plinth/locale/de/LC_MESSAGES/django.po
index c2f3967e7..add34e30d 100644
--- a/plinth/locale/de/LC_MESSAGES/django.po
+++ b/plinth/locale/de/LC_MESSAGES/django.po
@@ -926,7 +926,7 @@ msgid "Run Diagnostics"
 msgstr "Diagnose starten"
 
 #: plinth/modules/diagnostics/templates/diagnostics.html:46
-msgid "Diagnotics test is currently running"
+msgid "Diagnostics test is currently running"
 msgstr "Diagnose läuft"
 
 #: plinth/modules/diagnostics/templates/diagnostics.html:59
diff --git a/plinth/locale/django.pot b/plinth/locale/django.pot
index b8b5143da..5711b80a8 100644
--- a/plinth/locale/django.pot
+++ b/plinth/locale/django.pot
@@ -829,7 +829,7 @@ msgid "Run Diagnostics"
 msgstr ""
 
 #: plinth/modules/diagnostics/templates/diagnostics.html:46
-msgid "Diagnotics test is currently running"
+msgid "Diagnostics test is currently running"
 msgstr ""
 
 #: plinth/modules/diagnostics/templates/diagnostics.html:59
diff --git a/plinth/locale/el/LC_MESSAGES/django.po b/plinth/locale/el/LC_MESSAGES/django.po
index 34c1fc2c5..b8f84b522 100644
--- a/plinth/locale/el/LC_MESSAGES/django.po
+++ b/plinth/locale/el/LC_MESSAGES/django.po
@@ -828,7 +828,7 @@ msgid "Run Diagnostics"
 msgstr ""
 
 #: plinth/modules/diagnostics/templates/diagnostics.html:46
-msgid "Diagnotics test is currently running"
+msgid "Diagnostics test is currently running"
 msgstr ""
 
 #: plinth/modules/diagnostics/templates/diagnostics.html:59
diff --git a/plinth/locale/es/LC_MESSAGES/django.po b/plinth/locale/es/LC_MESSAGES/django.po
index 5561b2f09..ecf3e37d7 100644
--- a/plinth/locale/es/LC_MESSAGES/django.po
+++ b/plinth/locale/es/LC_MESSAGES/django.po
@@ -928,7 +928,7 @@ msgid "Run Diagnostics"
 msgstr "Ejecutar diagnósticos"
 
 #: plinth/modules/diagnostics/templates/diagnostics.html:46
-msgid "Diagnotics test is currently running"
+msgid "Diagnostics test is currently running"
 msgstr "El test de diagnósticos está ejecutándose"
 
 #: plinth/modules/diagnostics/templates/diagnostics.html:59
diff --git a/plinth/locale/fa/LC_MESSAGES/django.po b/plinth/locale/fa/LC_MESSAGES/django.po
index a9a119d44..c266f1024 100644
--- a/plinth/locale/fa/LC_MESSAGES/django.po
+++ b/plinth/locale/fa/LC_MESSAGES/django.po
@@ -916,7 +916,7 @@ msgid "Run Diagnostics"
 msgstr "اجرای عیب‌یابی"
 
 #: plinth/modules/diagnostics/templates/diagnostics.html:46
-msgid "Diagnotics test is currently running"
+msgid "Diagnostics test is currently running"
 msgstr "آزمون عیب‌یابی در حال اجراست"
 
 #: plinth/modules/diagnostics/templates/diagnostics.html:59
diff --git a/plinth/locale/fake/LC_MESSAGES/django.po b/plinth/locale/fake/LC_MESSAGES/django.po
index 2204a1884..a2ace4d56 100644
--- a/plinth/locale/fake/LC_MESSAGES/django.po
+++ b/plinth/locale/fake/LC_MESSAGES/django.po
@@ -960,7 +960,7 @@ msgid "Run Diagnostics"
 msgstr "RUN DIAGNOSTICS"
 
 #: plinth/modules/diagnostics/templates/diagnostics.html:46
-msgid "Diagnotics test is currently running"
+msgid "Diagnostics test is currently running"
 msgstr "DIAGNOTICS TEST IS CURRENTLY RUNNING"
 
 #: plinth/modules/diagnostics/templates/diagnostics.html:59
diff --git a/plinth/locale/fr/LC_MESSAGES/django.po b/plinth/locale/fr/LC_MESSAGES/django.po
index 067222d43..cb6cbbb8c 100644
--- a/plinth/locale/fr/LC_MESSAGES/django.po
+++ b/plinth/locale/fr/LC_MESSAGES/django.po
@@ -920,7 +920,7 @@ msgid "Run Diagnostics"
 msgstr "Lancer les diagnostics"
 
 #: plinth/modules/diagnostics/templates/diagnostics.html:46
-msgid "Diagnotics test is currently running"
+msgid "Diagnostics test is currently running"
 msgstr "Les tests de diagnostic sont en cours"
 
 #: plinth/modules/diagnostics/templates/diagnostics.html:59
diff --git a/plinth/locale/gl/LC_MESSAGES/django.po b/plinth/locale/gl/LC_MESSAGES/django.po
index 5dd4e6445..27af30fb4 100644
--- a/plinth/locale/gl/LC_MESSAGES/django.po
+++ b/plinth/locale/gl/LC_MESSAGES/django.po
@@ -833,7 +833,7 @@ msgid "Run Diagnostics"
 msgstr ""
 
 #: plinth/modules/diagnostics/templates/diagnostics.html:46
-msgid "Diagnotics test is currently running"
+msgid "Diagnostics test is currently running"
 msgstr ""
 
 #: plinth/modules/diagnostics/templates/diagnostics.html:59
diff --git a/plinth/locale/gu/LC_MESSAGES/django.po b/plinth/locale/gu/LC_MESSAGES/django.po
index da88822a3..eb7bc4ff6 100644
--- a/plinth/locale/gu/LC_MESSAGES/django.po
+++ b/plinth/locale/gu/LC_MESSAGES/django.po
@@ -880,7 +880,7 @@ msgid "Run Diagnostics"
 msgstr "તપાસ કરો"
 
 #: plinth/modules/diagnostics/templates/diagnostics.html:46
-msgid "Diagnotics test is currently running"
+msgid "Diagnostics test is currently running"
 msgstr "તપાસકીય પરિક્ષણ ચાલી રહ્યું છે"
 
 #: plinth/modules/diagnostics/templates/diagnostics.html:59
diff --git a/plinth/locale/hi/LC_MESSAGES/django.po b/plinth/locale/hi/LC_MESSAGES/django.po
index cc7163d04..55792d1b2 100644
--- a/plinth/locale/hi/LC_MESSAGES/django.po
+++ b/plinth/locale/hi/LC_MESSAGES/django.po
@@ -932,7 +932,7 @@ msgid "Run Diagnostics"
 msgstr "निदानिकी चलिये"
 
 #: plinth/modules/diagnostics/templates/diagnostics.html:46
-msgid "Diagnotics test is currently running"
+msgid "Diagnostics test is currently running"
 msgstr "निदानिकी परिक्षा अभी चल रहा है"
 
 #: plinth/modules/diagnostics/templates/diagnostics.html:59
diff --git a/plinth/locale/hu/LC_MESSAGES/django.po b/plinth/locale/hu/LC_MESSAGES/django.po
index dcf66425f..b1a0653ca 100644
--- a/plinth/locale/hu/LC_MESSAGES/django.po
+++ b/plinth/locale/hu/LC_MESSAGES/django.po
@@ -928,7 +928,7 @@ msgid "Run Diagnostics"
 msgstr "Ellenőrzés indítása"
 
 #: plinth/modules/diagnostics/templates/diagnostics.html:46
-msgid "Diagnotics test is currently running"
+msgid "Diagnostics test is currently running"
 msgstr "Az ellenőrzés jelenleg fut"
 
 #: plinth/modules/diagnostics/templates/diagnostics.html:59
diff --git a/plinth/locale/id/LC_MESSAGES/django.po b/plinth/locale/id/LC_MESSAGES/django.po
index 4ad8f3867..0c927c978 100644
--- a/plinth/locale/id/LC_MESSAGES/django.po
+++ b/plinth/locale/id/LC_MESSAGES/django.po
@@ -872,7 +872,7 @@ msgid "Run Diagnostics"
 msgstr "Jalankan Diagnosa"
 
 #: plinth/modules/diagnostics/templates/diagnostics.html:46
-msgid "Diagnotics test is currently running"
+msgid "Diagnostics test is currently running"
 msgstr ""
 
 #: plinth/modules/diagnostics/templates/diagnostics.html:59
diff --git a/plinth/locale/it/LC_MESSAGES/django.po b/plinth/locale/it/LC_MESSAGES/django.po
index ac14b5f4d..9ae15c114 100644
--- a/plinth/locale/it/LC_MESSAGES/django.po
+++ b/plinth/locale/it/LC_MESSAGES/django.po
@@ -910,7 +910,7 @@ msgid "Run Diagnostics"
 msgstr "Esegui Diagnostica"
 
 #: plinth/modules/diagnostics/templates/diagnostics.html:46
-msgid "Diagnotics test is currently running"
+msgid "Diagnostics test is currently running"
 msgstr "Il test diagnostico è in esecuzione"
 
 #: plinth/modules/diagnostics/templates/diagnostics.html:59
diff --git a/plinth/locale/ja/LC_MESSAGES/django.po b/plinth/locale/ja/LC_MESSAGES/django.po
index f6580a754..7cf53a82e 100644
--- a/plinth/locale/ja/LC_MESSAGES/django.po
+++ b/plinth/locale/ja/LC_MESSAGES/django.po
@@ -830,7 +830,7 @@ msgid "Run Diagnostics"
 msgstr ""
 
 #: plinth/modules/diagnostics/templates/diagnostics.html:46
-msgid "Diagnotics test is currently running"
+msgid "Diagnostics test is currently running"
 msgstr ""
 
 #: plinth/modules/diagnostics/templates/diagnostics.html:59
diff --git a/plinth/locale/kn/LC_MESSAGES/django.po b/plinth/locale/kn/LC_MESSAGES/django.po
index f6580a754..7cf53a82e 100644
--- a/plinth/locale/kn/LC_MESSAGES/django.po
+++ b/plinth/locale/kn/LC_MESSAGES/django.po
@@ -830,7 +830,7 @@ msgid "Run Diagnostics"
 msgstr ""
 
 #: plinth/modules/diagnostics/templates/diagnostics.html:46
-msgid "Diagnotics test is currently running"
+msgid "Diagnostics test is currently running"
 msgstr ""
 
 #: plinth/modules/diagnostics/templates/diagnostics.html:59
diff --git a/plinth/locale/lt/LC_MESSAGES/django.po b/plinth/locale/lt/LC_MESSAGES/django.po
index 10eb97d76..42d3b2f0f 100644
--- a/plinth/locale/lt/LC_MESSAGES/django.po
+++ b/plinth/locale/lt/LC_MESSAGES/django.po
@@ -831,7 +831,7 @@ msgid "Run Diagnostics"
 msgstr ""
 
 #: plinth/modules/diagnostics/templates/diagnostics.html:46
-msgid "Diagnotics test is currently running"
+msgid "Diagnostics test is currently running"
 msgstr ""
 
 #: plinth/modules/diagnostics/templates/diagnostics.html:59
diff --git a/plinth/locale/nb/LC_MESSAGES/django.po b/plinth/locale/nb/LC_MESSAGES/django.po
index 10a020205..1ef87bd07 100644
--- a/plinth/locale/nb/LC_MESSAGES/django.po
+++ b/plinth/locale/nb/LC_MESSAGES/django.po
@@ -927,7 +927,7 @@ msgid "Run Diagnostics"
 msgstr "Kjør diagnostikk"
 
 #: plinth/modules/diagnostics/templates/diagnostics.html:46
-msgid "Diagnotics test is currently running"
+msgid "Diagnostics test is currently running"
 msgstr "Diagnostikktest kjører nå"
 
 #: plinth/modules/diagnostics/templates/diagnostics.html:59
diff --git a/plinth/locale/nl/LC_MESSAGES/django.po b/plinth/locale/nl/LC_MESSAGES/django.po
index 0bf849e1f..e132d0671 100644
--- a/plinth/locale/nl/LC_MESSAGES/django.po
+++ b/plinth/locale/nl/LC_MESSAGES/django.po
@@ -941,7 +941,7 @@ msgid "Run Diagnostics"
 msgstr "Voer Diagnostische test uit"
 
 #: plinth/modules/diagnostics/templates/diagnostics.html:46
-msgid "Diagnotics test is currently running"
+msgid "Diagnostics test is currently running"
 msgstr "Diagnosetests worden doorlopen"
 
 #: plinth/modules/diagnostics/templates/diagnostics.html:59
diff --git a/plinth/locale/pl/LC_MESSAGES/django.po b/plinth/locale/pl/LC_MESSAGES/django.po
index 52e875b5c..62652b1e5 100644
--- a/plinth/locale/pl/LC_MESSAGES/django.po
+++ b/plinth/locale/pl/LC_MESSAGES/django.po
@@ -915,7 +915,7 @@ msgid "Run Diagnostics"
 msgstr "Uruchom diagnostykę"
 
 #: plinth/modules/diagnostics/templates/diagnostics.html:46
-msgid "Diagnotics test is currently running"
+msgid "Diagnostics test is currently running"
 msgstr "Diagnostyka jest właśnie uruchomiona"
 
 #: plinth/modules/diagnostics/templates/diagnostics.html:59
diff --git a/plinth/locale/pt/LC_MESSAGES/django.po b/plinth/locale/pt/LC_MESSAGES/django.po
index 04d585ff3..e495129ec 100644
--- a/plinth/locale/pt/LC_MESSAGES/django.po
+++ b/plinth/locale/pt/LC_MESSAGES/django.po
@@ -920,7 +920,7 @@ msgid "Run Diagnostics"
 msgstr ""
 
 #: plinth/modules/diagnostics/templates/diagnostics.html:46
-msgid "Diagnotics test is currently running"
+msgid "Diagnostics test is currently running"
 msgstr ""
 
 #: plinth/modules/diagnostics/templates/diagnostics.html:59
diff --git a/plinth/locale/ru/LC_MESSAGES/django.po b/plinth/locale/ru/LC_MESSAGES/django.po
index b77caf7bb..1ab4ff8bd 100644
--- a/plinth/locale/ru/LC_MESSAGES/django.po
+++ b/plinth/locale/ru/LC_MESSAGES/django.po
@@ -921,7 +921,7 @@ msgid "Run Diagnostics"
 msgstr "Запуск диагностики"
 
 #: plinth/modules/diagnostics/templates/diagnostics.html:46
-msgid "Diagnotics test is currently running"
+msgid "Diagnostics test is currently running"
 msgstr "В настоящее время запущен диагностический тест"
 
 #: plinth/modules/diagnostics/templates/diagnostics.html:59
diff --git a/plinth/locale/sl/LC_MESSAGES/django.po b/plinth/locale/sl/LC_MESSAGES/django.po
index 3d7100e90..f4f15ac80 100644
--- a/plinth/locale/sl/LC_MESSAGES/django.po
+++ b/plinth/locale/sl/LC_MESSAGES/django.po
@@ -906,7 +906,7 @@ msgid "Run Diagnostics"
 msgstr ""
 
 #: plinth/modules/diagnostics/templates/diagnostics.html:46
-msgid "Diagnotics test is currently running"
+msgid "Diagnostics test is currently running"
 msgstr ""
 
 #: plinth/modules/diagnostics/templates/diagnostics.html:59
diff --git a/plinth/locale/sv/LC_MESSAGES/django.po b/plinth/locale/sv/LC_MESSAGES/django.po
index 2cc645608..c22a72237 100644
--- a/plinth/locale/sv/LC_MESSAGES/django.po
+++ b/plinth/locale/sv/LC_MESSAGES/django.po
@@ -923,7 +923,7 @@ msgid "Run Diagnostics"
 msgstr "Utför diagnostik"
 
 #: plinth/modules/diagnostics/templates/diagnostics.html:46
-msgid "Diagnotics test is currently running"
+msgid "Diagnostics test is currently running"
 msgstr "Diagnotiktest körs för närvarande"
 
 #: plinth/modules/diagnostics/templates/diagnostics.html:59
diff --git a/plinth/locale/ta/LC_MESSAGES/django.po b/plinth/locale/ta/LC_MESSAGES/django.po
index f669b63d5..bde20186d 100644
--- a/plinth/locale/ta/LC_MESSAGES/django.po
+++ b/plinth/locale/ta/LC_MESSAGES/django.po
@@ -830,7 +830,7 @@ msgid "Run Diagnostics"
 msgstr ""
 
 #: plinth/modules/diagnostics/templates/diagnostics.html:46
-msgid "Diagnotics test is currently running"
+msgid "Diagnostics test is currently running"
 msgstr ""
 
 #: plinth/modules/diagnostics/templates/diagnostics.html:59
diff --git a/plinth/locale/te/LC_MESSAGES/django.po b/plinth/locale/te/LC_MESSAGES/django.po
index b34486741..7d860f0da 100644
--- a/plinth/locale/te/LC_MESSAGES/django.po
+++ b/plinth/locale/te/LC_MESSAGES/django.po
@@ -921,7 +921,7 @@ msgid "Run Diagnostics"
 msgstr "లక్షణాలను నడుపు"
 
 #: plinth/modules/diagnostics/templates/diagnostics.html:46
-msgid "Diagnotics test is currently running"
+msgid "Diagnostics test is currently running"
 msgstr "ప్రస్తుతం నిర్ధారణ పరీక్ష నడుస్తుంది"
 
 #: plinth/modules/diagnostics/templates/diagnostics.html:59
diff --git a/plinth/locale/tr/LC_MESSAGES/django.po b/plinth/locale/tr/LC_MESSAGES/django.po
index 308acaeaa..c3de5f9ff 100644
--- a/plinth/locale/tr/LC_MESSAGES/django.po
+++ b/plinth/locale/tr/LC_MESSAGES/django.po
@@ -930,7 +930,7 @@ msgid "Run Diagnostics"
 msgstr "Teşhisleri Çalıştır"
 
 #: plinth/modules/diagnostics/templates/diagnostics.html:46
-msgid "Diagnotics test is currently running"
+msgid "Diagnostics test is currently running"
 msgstr "Teşhis testi şu anda çalışmaktadır"
 
 #: plinth/modules/diagnostics/templates/diagnostics.html:59
diff --git a/plinth/locale/uk/LC_MESSAGES/django.po b/plinth/locale/uk/LC_MESSAGES/django.po
index 2031c4120..607974af5 100644
--- a/plinth/locale/uk/LC_MESSAGES/django.po
+++ b/plinth/locale/uk/LC_MESSAGES/django.po
@@ -864,7 +864,7 @@ msgid "Run Diagnostics"
 msgstr ""
 
 #: plinth/modules/diagnostics/templates/diagnostics.html:46
-msgid "Diagnotics test is currently running"
+msgid "Diagnostics test is currently running"
 msgstr ""
 
 #: plinth/modules/diagnostics/templates/diagnostics.html:59
diff --git a/plinth/locale/zh_Hans/LC_MESSAGES/django.po b/plinth/locale/zh_Hans/LC_MESSAGES/django.po
index d6c1291ea..4d90c0477 100644
--- a/plinth/locale/zh_Hans/LC_MESSAGES/django.po
+++ b/plinth/locale/zh_Hans/LC_MESSAGES/django.po
@@ -893,7 +893,7 @@ msgid "Run Diagnostics"
 msgstr "运行诊断程序"
 
 #: plinth/modules/diagnostics/templates/diagnostics.html:46
-msgid "Diagnotics test is currently running"
+msgid "Diagnostics test is currently running"
 msgstr "当前正在运行诊断测试"
 
 #: plinth/modules/diagnostics/templates/diagnostics.html:59
diff --git a/plinth/modules/backups/api.py b/plinth/modules/backups/api.py
index f359c35ae..a6b0a9780 100644
--- a/plinth/modules/backups/api.py
+++ b/plinth/modules/backups/api.py
@@ -399,7 +399,7 @@ class ServiceHandler:
 
 
 class SystemServiceHandler(ServiceHandler):
-    """Handle starting and stoping of system services for backup."""
+    """Handle starting and stopping of system services for backup."""
 
     def __init__(self, backup_app, service):
         """Initialize the object."""
@@ -419,7 +419,7 @@ class SystemServiceHandler(ServiceHandler):
 
 
 class ApacheServiceHandler(ServiceHandler):
-    """Handle starting and stoping of Apache services for backup."""
+    """Handle starting and stopping of Apache services for backup."""
 
     def __init__(self, backup_app, service):
         """Initialize the object."""
diff --git a/plinth/modules/backups/repository.py b/plinth/modules/backups/repository.py
index cd19b111d..c967b8126 100644
--- a/plinth/modules/backups/repository.py
+++ b/plinth/modules/backups/repository.py
@@ -240,7 +240,7 @@ class SshBorgRepository(BorgRepository):
 
     def __init__(self, uuid=None, path=None, credentials=None, **kwargs):
         """
-        Instanciate a new repository.
+        Instantiate a new repository.
 
         If only a uuid is given, load the values from kvstore.
         """
diff --git a/plinth/modules/diagnostics/templates/diagnostics.html b/plinth/modules/diagnostics/templates/diagnostics.html
index a923b0e1f..cec18866f 100644
--- a/plinth/modules/diagnostics/templates/diagnostics.html
+++ b/plinth/modules/diagnostics/templates/diagnostics.html
@@ -43,7 +43,7 @@
              value="{% trans "Run Diagnostics" %}"/>
     </form>
   {% else %}
-    <p>{% trans "Diagnotics test is currently running" %}</p>
+    <p>{% trans "Diagnostics test is currently running" %}</p>
     <div class="progress">
       <div class="progress-bar progress-bar-striped active"
            role="progressbar" aria-valuemin="0" aria-valuemax="100"
diff --git a/plinth/modules/mediawiki/__init__.py b/plinth/modules/mediawiki/__init__.py
index 5e60a58c2..7d2d2f518 100644
--- a/plinth/modules/mediawiki/__init__.py
+++ b/plinth/modules/mediawiki/__init__.py
@@ -142,6 +142,6 @@ def is_public_registration_enabled():
 
 
 def is_private_mode_enabled():
-    """ Return wheter private mode is enabled or disabled"""
+    """ Return whether private mode is enabled or disabled"""
     output = actions.superuser_run('mediawiki', ['private-mode', 'status'])
     return output.strip() == 'enabled'
diff --git a/plinth/modules/storage/tests/test_storage.py b/plinth/modules/storage/tests/test_storage.py
index be054e3b1..0fab834f5 100644
--- a/plinth/modules/storage/tests/test_storage.py
+++ b/plinth/modules/storage/tests/test_storage.py
@@ -27,7 +27,7 @@ import pytest
 
 
 def _get_partition_device(device, partition_number):
-    """Return the device corresponding to a parition in a given device."""
+    """Return the device corresponding to a partition in a given device."""
     if re.match('[0-9]', device[-1]):
         return device + 'p' + str(partition_number)
 
@@ -192,7 +192,7 @@ class TestActions:
             self.assert_ext4_file_system_healthy(1)
 
     def assert_free_space(self, partition_number, space=True):
-        """Verify that free is available/not available after a parition."""
+        """Verify that free is available/not available after a partition."""
         device = _get_partition_device(self.device, partition_number)
         result = self.run_action(
             ['storage', 'is-partition-expandable', device])
diff --git a/plinth/modules/users/views.py b/plinth/modules/users/views.py
index bc96e7366..d35b2fab8 100644
--- a/plinth/modules/users/views.py
+++ b/plinth/modules/users/views.py
@@ -104,7 +104,7 @@ class UserUpdate(ContextMixin, SuccessMessageMixin, UpdateView):
         return super().dispatch(request, *args, **kwargs)
 
     def get_form_kwargs(self):
-        """Make the requst object available to the form."""
+        """Make the request object available to the form."""
         kwargs = super(UserUpdate, self).get_form_kwargs()
         kwargs['request'] = self.request
         kwargs['username'] = self.object.username
diff --git a/plinth/setup.py b/plinth/setup.py
index a8f3a0657..28adc51de 100644
--- a/plinth/setup.py
+++ b/plinth/setup.py
@@ -360,7 +360,7 @@ class ForceUpgrader():
 
     When upgrades packages, many things have to be kept in mind. The following
     is the understanding on how unattended-upgrades does its upgrades. These
-    precautions need to be taken into account whenever relavent.
+    precautions need to be taken into account whenever relevant.
 
     Checks done by unattended upgrades before upgrading:
     - Check if today is a configured patch day.
diff --git a/plinth/tests/test_utils.py b/plinth/tests/test_utils.py
index 0394bc5b4..611319515 100644
--- a/plinth/tests/test_utils.py
+++ b/plinth/tests/test_utils.py
@@ -34,7 +34,7 @@ class TestIsAdminUser:
     @staticmethod
     @pytest.fixture(name='web_request')
     def fixture_web_request():
-        """Setup each test case befor execution."""
+        """Setup each test case before execution."""
         web_request = RequestFactory().get('/plinth/mockapp')
         web_request.user = Mock()
         web_request.session = MagicMock()
diff --git a/plinth/utils.py b/plinth/utils.py
index c0821b60d..aa3a4bcdc 100644
--- a/plinth/utils.py
+++ b/plinth/utils.py
@@ -56,7 +56,7 @@ format_lazy = lazy(_format_lazy, str)
 
 
 def non_admin_view(func):
-    """Decorator to mark a view as accesible by non-admin users."""
+    """Decorator to mark a view as accessible by non-admin users."""
     setattr(func, 'IS_NON_ADMIN', True)
     return func