diff --git a/src/qml/SettingsPage.qml b/src/qml/SettingsPage.qml
index b4672d7a9..ee7341c39 100644
--- a/src/qml/SettingsPage.qml
+++ b/src/qml/SettingsPage.qml
@@ -10,19 +10,23 @@ Page {
         Column {
             width: parent.width
 
+            spacing: Theme.paddingMedium
+
             PageHeader {
                 title: qsTranslate("", "Settings")
             }
 
             TextSwitch {
                 text: qsTranslate("", "Apply on boot")
+                description: qsTranslate("", "Apply all enabled patches when the system starts")
                 checked: PatchManager.applyOnBoot
                 onClicked: PatchManager.applyOnBoot = !PatchManager.applyOnBoot
                 automaticCheck: false
             }
 
             TextSwitch {
-                text: qsTranslate("", "Developer mode")
+                text: qsTranslate("", "Allow incompatible patches")
+                description: qsTranslate("", "Apply patches which are not marked compatible with the installed Sailfish OS version. Note that this will not fix patches that are actually incompatible.")
                 checked: PatchManager.developerMode
                 onClicked: PatchManager.developerMode = !PatchManager.developerMode
                 automaticCheck: false
diff --git a/src/qml/settings-patchmanager.ts b/src/qml/settings-patchmanager.ts
index 88b762554..0e2ebd0ca 100644
--- a/src/qml/settings-patchmanager.ts
+++ b/src/qml/settings-patchmanager.ts
@@ -4,316 +4,342 @@
 <context>
     <name></name>
     <message>
-        <location filename="AboutPage.qml" line="48"/>
-        <location filename="PatchManagerPage.qml" line="116"/>
+        <location filename="AboutPage.qml" line="49"/>
+        <location filename="PatchManagerPage.qml" line="142"/>
         <source>About</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="AboutPage.qml" line="62"/>
+        <location filename="AboutPage.qml" line="63"/>
         <source>Patchmanager</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="AboutPage.qml" line="80"/>
+        <location filename="AboutPage.qml" line="71"/>
+        <source>Version: %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="AboutPage.qml" line="81"/>
         <source>Patchmanager allows system modification via patches. It provides a system daemon that is in charge of performing those patches, as well as a GUI, to control those operations and installation/removal of patches.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="AboutPage.qml" line="91"/>
-        <location filename="WebPatchPage.qml" line="300"/>
+        <location filename="AboutPage.qml" line="92"/>
+        <location filename="WebPatchPage.qml" line="246"/>
         <source>Donate</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="AboutPage.qml" line="102"/>
-        <location filename="DevelopersPage.qml" line="97"/>
+        <location filename="AboutPage.qml" line="103"/>
+        <location filename="DevelopersPage.qml" line="107"/>
         <source>Developers</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="DevelopersPage.qml" line="136"/>
+        <location filename="DevelopersPage.qml" line="146"/>
         <source>%1&apos;s webpage</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="DevelopersPage.qml" line="141"/>
+        <location filename="DevelopersPage.qml" line="151"/>
         <source>%1&apos;s Twitter account</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="LegacyPatchPage.qml" line="49"/>
-        <location filename="NewPatchPage.qml" line="49"/>
+        <location filename="LegacyPatchPage.qml" line="52"/>
+        <location filename="NewPatchPage.qml" line="52"/>
         <source>Patch being applied</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="LegacyPatchPage.qml" line="49"/>
-        <location filename="NewPatchPage.qml" line="49"/>
+        <location filename="LegacyPatchPage.qml" line="54"/>
+        <location filename="NewPatchPage.qml" line="54"/>
         <source>Unapply patch</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="LegacyPatchPage.qml" line="49"/>
-        <location filename="NewPatchPage.qml" line="49"/>
+        <location filename="LegacyPatchPage.qml" line="55"/>
+        <location filename="NewPatchPage.qml" line="55"/>
         <source>Apply patch</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="LegacyPatchPage.qml" line="66"/>
-        <location filename="WebPatchPage.qml" line="139"/>
-        <source>Patch information</source>
+        <location filename="LegacyPatchPage.qml" line="63"/>
+        <location filename="NewPatchPage.qml" line="63"/>
+        <source>Load engine before applying patches</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="LegacyPatchPage.qml" line="76"/>
-        <location filename="NewPatchPage.qml" line="76"/>
-        <source>This patch is no available anymore. You won&apos;t be able to reinstall it.</source>
+        <location filename="LegacyPatchPage.qml" line="73"/>
+        <location filename="WebPatchPage.qml" line="85"/>
+        <source>Patch information</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="LegacyPatchPage.qml" line="80"/>
-        <source>Name</source>
+        <location filename="LegacyPatchPage.qml" line="83"/>
+        <location filename="NewPatchPage.qml" line="83"/>
+        <source>This patch is no available anymore. You won&apos;t be able to reinstall it.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="LegacyPatchPage.qml" line="94"/>
-        <source>Maintainer</source>
+        <location filename="LegacyPatchPage.qml" line="87"/>
+        <source>Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="LegacyPatchPage.qml" line="107"/>
-        <location filename="NewPatchPage.qml" line="106"/>
-        <source>Description</source>
+        <location filename="LegacyPatchPage.qml" line="100"/>
+        <location filename="NewPatchPage.qml" line="115"/>
+        <source>Version</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="NewPatchPage.qml" line="80"/>
-        <source>Author</source>
+        <location filename="LegacyPatchPage.qml" line="114"/>
+        <source>Maintainer</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="NewPatchPage.qml" line="93"/>
-        <source>Compatible</source>
+        <location filename="LegacyPatchPage.qml" line="128"/>
+        <location filename="NewPatchPage.qml" line="101"/>
+        <source>Possible conflicts</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="PatchManagerPage.qml" line="43"/>
-        <source>Browser</source>
+        <location filename="LegacyPatchPage.qml" line="141"/>
+        <location filename="NewPatchPage.qml" line="141"/>
+        <source>Description</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="PatchManagerPage.qml" line="44"/>
-        <source>Camera</source>
+        <location filename="LegacyPatchPage.qml" line="153"/>
+        <location filename="NewPatchPage.qml" line="154"/>
+        <source>Patch log</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="PatchManagerPage.qml" line="45"/>
-        <source>Calendar</source>
+        <location filename="LegacyPatchPage.qml" line="162"/>
+        <location filename="NewPatchPage.qml" line="164"/>
+        <source>No log yet</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="PatchManagerPage.qml" line="46"/>
-        <source>Clock</source>
+        <location filename="NewPatchPage.qml" line="87"/>
+        <source>Author</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="PatchManagerPage.qml" line="47"/>
-        <source>Contacts</source>
+        <location filename="NewPatchPage.qml" line="128"/>
+        <source>Compatible</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="PatchManagerPage.qml" line="48"/>
-        <source>Email</source>
+        <location filename="PatchManagerPage.qml" line="137"/>
+        <location filename="SettingsPage.qml" line="16"/>
+        <source>Settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="PatchManagerPage.qml" line="49"/>
-        <source>Gallery</source>
+        <location filename="PatchManagerPage.qml" line="147"/>
+        <source>Unapply all patches</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="PatchManagerPage.qml" line="50"/>
-        <source>Homescreen</source>
+        <location filename="PatchManagerPage.qml" line="153"/>
+        <source>Load engine</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="PatchManagerPage.qml" line="51"/>
-        <source>Media</source>
+        <location filename="PatchManagerPage.qml" line="159"/>
+        <location filename="WebCatalogPage.qml" line="93"/>
+        <source>Web catalog</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="PatchManagerPage.qml" line="52"/>
-        <source>Messages</source>
+        <location filename="PatchManagerPage.qml" line="159"/>
+        <source>Updates available</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="PatchManagerPage.qml" line="53"/>
-        <source>Phone</source>
+        <location filename="PatchManagerPage.qml" line="165"/>
+        <source>Restart preloaded services</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="PatchManagerPage.qml" line="54"/>
-        <source>Silica</source>
+        <location filename="PatchManagerPage.qml" line="171"/>
+        <source>Resolve failure</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="PatchManagerPage.qml" line="55"/>
-        <source>Settings</source>
+        <location filename="PatchManagerPage.qml" line="178"/>
+        <source>Installed patches</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="PatchManagerPage.qml" line="56"/>
-        <source>Other</source>
+        <location filename="PatchManagerPage.qml" line="357"/>
+        <source>This patch is not compatible with SailfishOS version!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="PatchManagerPage.qml" line="111"/>
-        <source>Disable developer mode</source>
+        <location filename="PatchManagerPage.qml" line="365"/>
+        <source>Uninstalling patch %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="PatchManagerPage.qml" line="111"/>
-        <source>Enable developer mode</source>
+        <location filename="PatchManagerPage.qml" line="470"/>
+        <source>Compatible with:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="PatchManagerPage.qml" line="121"/>
-        <location filename="WebCatalogPage.qml" line="83"/>
-        <source>Web catalog</source>
+        <location filename="PatchManagerPage.qml" line="484"/>
+        <source>Have possible conflicts</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="PatchManagerPage.qml" line="127"/>
-        <source>Restart preloaded services</source>
+        <location filename="PatchManagerPage.qml" line="487"/>
+        <source>Patch info</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="PatchManagerPage.qml" line="134"/>
-        <source>Installed patches</source>
+        <location filename="PatchManagerPage.qml" line="491"/>
+        <source>Unapply</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="PatchManagerPage.qml" line="173"/>
-        <source>This patch is not compatible with SailfishOS version!</source>
+        <location filename="PatchManagerPage.qml" line="491"/>
+        <source>Apply</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="PatchManagerPage.qml" line="196"/>
-        <source>Uninstalling patch %1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="PatchManagerPage.qml" line="306"/>
+        <location filename="PatchManagerPage.qml" line="496"/>
         <source>Uninstall</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="PatchManagerPage.qml" line="320"/>
-        <location filename="WebCatalogPage.qml" line="187"/>
+        <location filename="PatchManagerPage.qml" line="510"/>
+        <location filename="WebCatalogPage.qml" line="232"/>
         <source>No patches available</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="RestartServicesDialog.qml" line="47"/>
+        <location filename="RestartServicesDialog.qml" line="48"/>
         <source>Restart services</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="RestartServicesDialog.qml" line="53"/>
-        <source>Both preloaded services (dialer, messages) and the homescreen will now be restarted. Your device might be unusable for a short moment.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="RestartServicesDialog.qml" line="55"/>
-        <source>Preloaded services (dialer, messages) will now be restarted. These application might take time to load for a short moment.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="RestartServicesDialog.qml" line="57"/>
-        <source>The homescreen will now be restarted. Your device might be unusable for a short moment.</source>
+        <location filename="RestartServicesDialog.qml" line="56"/>
+        <source>Some services will now be restarted. Phone interface might take time to load for a short moment.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="ScreenshotsPage.qml" line="39"/>
-        <location filename="WebPatchPage.qml" line="326"/>
+        <location filename="ScreenshotsPage.qml" line="71"/>
+        <location filename="WebPatchPage.qml" line="272"/>
         <source>Screenshots</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="WebCatalogPage.qml" line="72"/>
+        <location filename="WebCatalogPage.qml" line="82"/>
         <source>Hide search field</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="WebCatalogPage.qml" line="72"/>
+        <location filename="WebCatalogPage.qml" line="82"/>
         <source>Show search field</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="WebCatalogPage.qml" line="83"/>
+        <location filename="WebCatalogPage.qml" line="93"/>
         <source>%1 patches</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="WebCatalogPage.qml" line="89"/>
+        <location filename="WebCatalogPage.qml" line="99"/>
         <source>Tap to enter search query</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="WebPatchPage.qml" line="129"/>
+        <location filename="WebCatalogPage.qml" line="219"/>
+        <source>Update available: %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="WebPatchPage.qml" line="75"/>
         <source>Problem in fetching patch data</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="WebPatchPage.qml" line="242"/>
+        <location filename="WebPatchPage.qml" line="75"/>
+        <source>Fetching patch information...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="WebPatchPage.qml" line="188"/>
         <source>Author: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="WebPatchPage.qml" line="258"/>
+        <location filename="WebPatchPage.qml" line="204"/>
         <source>Links</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="WebPatchPage.qml" line="279"/>
+        <location filename="WebPatchPage.qml" line="225"/>
         <source>Open discussion link</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="WebPatchPage.qml" line="321"/>
+        <location filename="WebPatchPage.qml" line="267"/>
         <source>Sources</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="WebPatchPage.qml" line="372"/>
+        <location filename="WebPatchPage.qml" line="318"/>
         <source>Files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="WebPatchPage.qml" line="388"/>
+        <location filename="WebPatchPage.qml" line="333"/>
         <source>This file is not compatible with SailfishOS version!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="WebPatchPage.qml" line="390"/>
+        <location filename="WebPatchPage.qml" line="335"/>
         <source>Install patch %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="WebPatchPage.qml" line="431"/>
+        <location filename="WebPatchPage.qml" line="388"/>
         <source>[installed]</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="WebPatchPage.qml" line="431"/>
+        <location filename="WebPatchPage.qml" line="388"/>
         <source>[click to install]</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="WebPatchPage.qml" line="446"/>
+        <location filename="WebPatchPage.qml" line="404"/>
         <source>Compatible: %1</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="SettingsPage.qml" line="20"/>
+        <source>Apply on boot</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="SettingsPage.qml" line="21"/>
+        <source>Apply all enabled patches when the system starts</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="SettingsPage.qml" line="28"/>
+        <source>Allow incompatible patches</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="SettingsPage.qml" line="29"/>
+        <source>Apply patches which are not marked compatible with the installed Sailfish OS version. Note that this will not fix patches that are actually incompatible.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/translations/settings-patchmanager-de.ts b/translations/settings-patchmanager-de.ts
index c4a0091a9..8d3bade3a 100644
--- a/translations/settings-patchmanager-de.ts
+++ b/translations/settings-patchmanager-de.ts
@@ -1,6 +1,8 @@
-<?xml version="1.0" ?><!DOCTYPE TS><TS language="de" version="2.1">
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE TS>
+<TS version="2.1" language="de">
 <context>
-    <name/>
+    <name></name>
     <message>
         <location filename="../src/qml/AboutPage.qml" line="49"/>
         <location filename="../src/qml/PatchManagerPage.qml" line="142"/>
@@ -8,39 +10,31 @@
         <translation>Über Patchmanager</translation>
     </message>
     <message>
-        <location filename="../src/bin/dialog/dialog.qml" line="45"/>
         <source>Apply patches</source>
-        <translation>Patches anwenden</translation>
+        <translation type="vanished">Patches anwenden</translation>
     </message>
     <message>
-        <location filename="../src/bin/dialog/dialog.qml" line="53"/>
         <source>Patchmanager will automatically apply patches in 10 seconds.</source>
-        <translation>Patchmanager wendet Patches automatisch in 10 Sekunden an.</translation>
+        <translation type="vanished">Patchmanager wendet Patches automatisch in 10 Sekunden an.</translation>
     </message>
     <message>
-        <location filename="../src/bin/dialog/dialog.qml" line="66"/>
         <source>Exit</source>
-        <translation>Beenden</translation>
+        <translation type="vanished">Beenden</translation>
     </message>
     <message>
-        <location filename="../src/bin/dialog/dialog.qml" line="28"/>
         <source>Applying patches</source>
-        <translation>Anwenden von Patches</translation>
+        <translation type="vanished">Anwenden von Patches</translation>
     </message>
     <message>
-        <location filename="../src/bin/dialog/dialog.qml" line="136"/>
         <source>Appled successfully!</source>
-        <translation>Erfolgreich angewendet!</translation>
+        <translation type="vanished">Erfolgreich angewendet!</translation>
     </message>
     <message>
-        <location filename="../src/bin/dialog/dialog.qml" line="137"/>
         <source>Failed applying patches!</source>
-        <translation>Fehler beim Anwenden von Patches!</translation>
+        <translation type="vanished">Fehler beim Anwenden von Patches!</translation>
     </message>
     <message>
-        <location filename="../src/bin/dialog/dialog.qml" line="165"/>
         <location filename="../src/qml/AboutPage.qml" line="63"/>
-        <location filename="../src/bin/patchmanager-daemon/patchmanagerobject.cpp" line="207"/>
         <source>Patchmanager</source>
         <translation>Patchmanager</translation>
     </message>
@@ -98,7 +92,7 @@
         <location filename="../src/qml/LegacyPatchPage.qml" line="63"/>
         <location filename="../src/qml/NewPatchPage.qml" line="63"/>
         <source>Load engine before applying patches</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/qml/LegacyPatchPage.qml" line="73"/>
@@ -346,144 +340,133 @@
         <translation>Kompatibel zu: %1 </translation>
     </message>
     <message>
-        <location filename="../src/bin/patchmanager-daemon/patchmanagerobject.cpp" line="218"/>
         <source>Patch installed</source>
-        <translation>Patch installiert</translation>
+        <translation type="vanished">Patch installiert</translation>
     </message>
     <message>
-        <location filename="../src/bin/patchmanager-daemon/patchmanagerobject.cpp" line="219"/>
         <source>Patch %1 installed</source>
-        <translation>Patch %1 installiert</translation>
+        <translation type="vanished">Patch %1 installiert</translation>
     </message>
     <message>
-        <location filename="../src/bin/patchmanager-daemon/patchmanagerobject.cpp" line="222"/>
         <source>Patch removed</source>
-        <translation>Patch entfernt</translation>
+        <translation type="vanished">Patch entfernt</translation>
     </message>
     <message>
-        <location filename="../src/bin/patchmanager-daemon/patchmanagerobject.cpp" line="223"/>
         <source>Patch %1 removed</source>
-        <translation>Patch %1 entfernt</translation>
+        <translation type="vanished">Patch %1 entfernt</translation>
     </message>
     <message>
-        <location filename="../src/bin/patchmanager-daemon/patchmanagerobject.cpp" line="226"/>
         <source>Failed to install patch</source>
-        <translation>Patch konnte nicht installiert werden</translation>
+        <translation type="vanished">Patch konnte nicht installiert werden</translation>
     </message>
     <message>
-        <location filename="../src/bin/patchmanager-daemon/patchmanagerobject.cpp" line="227"/>
         <source>Patch %1 installation failed</source>
-        <translation>Patch %1 konnte nicht installiert werden</translation>
+        <translation type="vanished">Patch %1 konnte nicht installiert werden</translation>
     </message>
     <message>
-        <location filename="../src/bin/patchmanager-daemon/patchmanagerobject.cpp" line="230"/>
         <source>Failed to remove patch</source>
-        <translation>Patch konnte nicht entfernt werden</translation>
+        <translation type="vanished">Patch konnte nicht entfernt werden</translation>
     </message>
     <message>
-        <location filename="../src/bin/patchmanager-daemon/patchmanagerobject.cpp" line="231"/>
         <source>Patch %1 removal failed</source>
-        <translation>Patch %1 konnte nicht entfernt werden</translation>
+        <translation type="vanished">Patch %1 konnte nicht entfernt werden</translation>
     </message>
     <message>
-        <location filename="../src/bin/patchmanager-daemon/patchmanagerobject.cpp" line="234"/>
         <source>Update available</source>
-        <translation>Aktualisierung verfügbar</translation>
+        <translation type="vanished">Aktualisierung verfügbar</translation>
     </message>
     <message>
-        <location filename="../src/bin/patchmanager-daemon/patchmanagerobject.cpp" line="235"/>
         <source>Patch %1 have update candidate</source>
-        <translation>Aktualisierung für Patch %1 verfügbar</translation>
+        <translation type="vanished">Aktualisierung für Patch %1 verfügbar</translation>
     </message>
     <message>
         <location filename="../src/qml/PatchManagerPage.qml" line="137"/>
-        <location filename="../src/qml/SettingsPage.qml" line="14"/>
+        <location filename="../src/qml/SettingsPage.qml" line="16"/>
         <source>Settings</source>
         <translation>Einstellungen</translation>
     </message>
     <message>
-        <location filename="../src/qml/SettingsPage.qml" line="18"/>
+        <location filename="../src/qml/SettingsPage.qml" line="20"/>
         <source>Apply on boot</source>
         <translation>Beim Booten anwenden</translation>
     </message>
     <message>
-        <location filename="../src/qml/SettingsPage.qml" line="25"/>
+        <location filename="../src/qml/SettingsPage.qml" line="21"/>
+        <source>Apply all enabled patches when the system starts</source>
+        <translation>Wendet alle gewählten Patches beim Systemstart an</translation>
+    </message>
+    <message>
+        <location filename="../src/qml/SettingsPage.qml" line="28"/>
+        <source>Allow incompatible patches</source>
+        <translation>Nicht kompatible Patches erlauben</translation>
+    </message>
+    <message>
+        <location filename="../src/qml/SettingsPage.qml" line="29"/>
+        <source>Apply patches which are not marked compatible with the installed Sailfish OS version. Note that this will not fix patches that are actually incompatible.</source>
+        <translation>Patches andenden, die nicht als kompatibel mit der laufenden Sailfish OS-Version markiert sind. NB: Das behebt keine Fehler durch tatsächlich nichtkompatible patches.</translation>
+    </message>
+    <message>
         <source>Developer mode</source>
-        <translation>Entwickler-Modus</translation>
+        <translation type="vanished">Entwickler-Modus</translation>
     </message>
 </context>
 <context>
     <name>Sections</name>
     <message>
-        <location filename="../src/qml/patchmanager.cpp" line="49"/>
         <source>browser</source>
-        <translation>Browser</translation>
+        <translation type="vanished">Browser</translation>
     </message>
     <message>
-        <location filename="../src/qml/patchmanager.cpp" line="50"/>
         <source>camera</source>
-        <translation>Kamera</translation>
+        <translation type="vanished">Kamera</translation>
     </message>
     <message>
-        <location filename="../src/qml/patchmanager.cpp" line="51"/>
         <source>calendar</source>
-        <translation>Kalender</translation>
+        <translation type="vanished">Kalender</translation>
     </message>
     <message>
-        <location filename="../src/qml/patchmanager.cpp" line="52"/>
         <source>clock</source>
-        <translation>Uhr</translation>
+        <translation type="vanished">Uhr</translation>
     </message>
     <message>
-        <location filename="../src/qml/patchmanager.cpp" line="53"/>
         <source>contacts</source>
-        <translation>Kontakte</translation>
+        <translation type="vanished">Kontakte</translation>
     </message>
     <message>
-        <location filename="../src/qml/patchmanager.cpp" line="54"/>
         <source>email</source>
-        <translation>E-Mail</translation>
+        <translation type="vanished">E-Mail</translation>
     </message>
     <message>
-        <location filename="../src/qml/patchmanager.cpp" line="55"/>
         <source>gallery</source>
-        <translation>Gallerie</translation>
+        <translation type="vanished">Gallerie</translation>
     </message>
     <message>
-        <location filename="../src/qml/patchmanager.cpp" line="56"/>
         <source>homescreen</source>
-        <translation>Startbildschirm</translation>
+        <translation type="vanished">Startbildschirm</translation>
     </message>
     <message>
-        <location filename="../src/qml/patchmanager.cpp" line="57"/>
         <source>media</source>
-        <translation>Medien</translation>
+        <translation type="vanished">Medien</translation>
     </message>
     <message>
-        <location filename="../src/qml/patchmanager.cpp" line="58"/>
         <source>messages</source>
-        <translation>Nachrichten</translation>
+        <translation type="vanished">Nachrichten</translation>
     </message>
     <message>
-        <location filename="../src/qml/patchmanager.cpp" line="59"/>
         <source>phone</source>
-        <translation>Telefon</translation>
+        <translation type="vanished">Telefon</translation>
     </message>
     <message>
-        <location filename="../src/qml/patchmanager.cpp" line="60"/>
         <source>silica</source>
-        <translation>Silica</translation>
+        <translation type="vanished">Silica</translation>
     </message>
     <message>
-        <location filename="../src/qml/patchmanager.cpp" line="61"/>
         <source>settings</source>
-        <translation>Einstellungen</translation>
+        <translation type="vanished">Einstellungen</translation>
     </message>
     <message>
-        <location filename="../src/qml/patchmanager.cpp" line="62"/>
-        <location filename="../src/qml/patchmanager.cpp" line="229"/>
         <source>other</source>
-        <translation>Andere</translation>
+        <translation type="vanished">Andere</translation>
     </message>
 </context>
-</TS>
\ No newline at end of file
+</TS>
diff --git a/translations/settings-patchmanager-en.ts b/translations/settings-patchmanager-en.ts
index f53142775..408c7b6c3 100644
--- a/translations/settings-patchmanager-en.ts
+++ b/translations/settings-patchmanager-en.ts
@@ -1,6 +1,8 @@
-<?xml version="1.0" ?><!DOCTYPE TS><TS language="en" version="2.1">
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE TS>
+<TS version="2.1" language="en">
 <context>
-    <name/>
+    <name></name>
     <message>
         <location filename="../src/qml/AboutPage.qml" line="49"/>
         <location filename="../src/qml/PatchManagerPage.qml" line="142"/>
@@ -8,39 +10,31 @@
         <translation>About</translation>
     </message>
     <message>
-        <location filename="../src/bin/dialog/dialog.qml" line="45"/>
         <source>Apply patches</source>
-        <translation>Apply patches</translation>
+        <translation type="vanished">Apply patches</translation>
     </message>
     <message>
-        <location filename="../src/bin/dialog/dialog.qml" line="53"/>
         <source>Patchmanager will automatically apply patches in 10 seconds.</source>
-        <translation>Patchmanager will automatically apply patches in 10 seconds.</translation>
+        <translation type="vanished">Patchmanager will automatically apply patches in 10 seconds.</translation>
     </message>
     <message>
-        <location filename="../src/bin/dialog/dialog.qml" line="66"/>
         <source>Exit</source>
-        <translation>Exit</translation>
+        <translation type="vanished">Exit</translation>
     </message>
     <message>
-        <location filename="../src/bin/dialog/dialog.qml" line="28"/>
         <source>Applying patches</source>
-        <translation>Applying patches</translation>
+        <translation type="vanished">Applying patches</translation>
     </message>
     <message>
-        <location filename="../src/bin/dialog/dialog.qml" line="136"/>
         <source>Appled successfully!</source>
-        <translation>Appled successfully!</translation>
+        <translation type="vanished">Appled successfully!</translation>
     </message>
     <message>
-        <location filename="../src/bin/dialog/dialog.qml" line="137"/>
         <source>Failed applying patches!</source>
-        <translation>Failed applying patches!</translation>
+        <translation type="vanished">Failed applying patches!</translation>
     </message>
     <message>
-        <location filename="../src/bin/dialog/dialog.qml" line="165"/>
         <location filename="../src/qml/AboutPage.qml" line="63"/>
-        <location filename="../src/bin/patchmanager-daemon/patchmanagerobject.cpp" line="207"/>
         <source>Patchmanager</source>
         <translation>Patchmanager</translation>
     </message>
@@ -346,144 +340,133 @@
         <translation>Compatible: %1</translation>
     </message>
     <message>
-        <location filename="../src/bin/patchmanager-daemon/patchmanagerobject.cpp" line="218"/>
         <source>Patch installed</source>
-        <translation>Patch installed</translation>
+        <translation type="vanished">Patch installed</translation>
     </message>
     <message>
-        <location filename="../src/bin/patchmanager-daemon/patchmanagerobject.cpp" line="219"/>
         <source>Patch %1 installed</source>
-        <translation>Patch %1 installed</translation>
+        <translation type="vanished">Patch %1 installed</translation>
     </message>
     <message>
-        <location filename="../src/bin/patchmanager-daemon/patchmanagerobject.cpp" line="222"/>
         <source>Patch removed</source>
-        <translation>Patch removed</translation>
+        <translation type="vanished">Patch removed</translation>
     </message>
     <message>
-        <location filename="../src/bin/patchmanager-daemon/patchmanagerobject.cpp" line="223"/>
         <source>Patch %1 removed</source>
-        <translation>Patch %1 removed</translation>
+        <translation type="vanished">Patch %1 removed</translation>
     </message>
     <message>
-        <location filename="../src/bin/patchmanager-daemon/patchmanagerobject.cpp" line="226"/>
         <source>Failed to install patch</source>
-        <translation>Failed to install patch</translation>
+        <translation type="vanished">Failed to install patch</translation>
     </message>
     <message>
-        <location filename="../src/bin/patchmanager-daemon/patchmanagerobject.cpp" line="227"/>
         <source>Patch %1 installation failed</source>
-        <translation>Patch %1 installation failed</translation>
+        <translation type="vanished">Patch %1 installation failed</translation>
     </message>
     <message>
-        <location filename="../src/bin/patchmanager-daemon/patchmanagerobject.cpp" line="230"/>
         <source>Failed to remove patch</source>
-        <translation>Failed to remove patch</translation>
+        <translation type="vanished">Failed to remove patch</translation>
     </message>
     <message>
-        <location filename="../src/bin/patchmanager-daemon/patchmanagerobject.cpp" line="231"/>
         <source>Patch %1 removal failed</source>
-        <translation>Patch %1 removal failed</translation>
+        <translation type="vanished">Patch %1 removal failed</translation>
     </message>
     <message>
-        <location filename="../src/bin/patchmanager-daemon/patchmanagerobject.cpp" line="234"/>
         <source>Update available</source>
-        <translation>Update available</translation>
+        <translation type="vanished">Update available</translation>
     </message>
     <message>
-        <location filename="../src/bin/patchmanager-daemon/patchmanagerobject.cpp" line="235"/>
         <source>Patch %1 have update candidate</source>
-        <translation>Patch %1 have update candidate</translation>
+        <translation type="vanished">Patch %1 have update candidate</translation>
     </message>
     <message>
         <location filename="../src/qml/PatchManagerPage.qml" line="137"/>
-        <location filename="../src/qml/SettingsPage.qml" line="14"/>
+        <location filename="../src/qml/SettingsPage.qml" line="16"/>
         <source>Settings</source>
         <translation>Settings</translation>
     </message>
     <message>
-        <location filename="../src/qml/SettingsPage.qml" line="18"/>
+        <location filename="../src/qml/SettingsPage.qml" line="20"/>
         <source>Apply on boot</source>
         <translation>Apply on boot</translation>
     </message>
     <message>
-        <location filename="../src/qml/SettingsPage.qml" line="25"/>
+        <location filename="../src/qml/SettingsPage.qml" line="21"/>
+        <source>Apply all enabled patches when the system starts</source>
+        <translation>Apply all enabled patches when the system starts</translation>
+    </message>
+    <message>
+        <location filename="../src/qml/SettingsPage.qml" line="28"/>
+        <source>Allow incompatible patches</source>
+        <translation>Allow incompatible patches</translation>
+    </message>
+    <message>
+        <location filename="../src/qml/SettingsPage.qml" line="29"/>
+        <source>Apply patches which are not marked compatible with the installed Sailfish OS version. Note that this will not fix patches that are actually incompatible.</source>
+        <translation>Apply patches which are not marked compatible with the installed Sailfish OS version. Note that this will not fix patches that are actually incompatible.</translation>
+    </message>
+    <message>
         <source>Developer mode</source>
-        <translation>Developer mode</translation>
+        <translation type="vanished">Developer mode</translation>
     </message>
 </context>
 <context>
     <name>Sections</name>
     <message>
-        <location filename="../src/qml/patchmanager.cpp" line="49"/>
         <source>browser</source>
-        <translation>browser</translation>
+        <translation type="vanished">browser</translation>
     </message>
     <message>
-        <location filename="../src/qml/patchmanager.cpp" line="50"/>
         <source>camera</source>
-        <translation>camera</translation>
+        <translation type="vanished">camera</translation>
     </message>
     <message>
-        <location filename="../src/qml/patchmanager.cpp" line="51"/>
         <source>calendar</source>
-        <translation>calendar</translation>
+        <translation type="vanished">calendar</translation>
     </message>
     <message>
-        <location filename="../src/qml/patchmanager.cpp" line="52"/>
         <source>clock</source>
-        <translation>clock</translation>
+        <translation type="vanished">clock</translation>
     </message>
     <message>
-        <location filename="../src/qml/patchmanager.cpp" line="53"/>
         <source>contacts</source>
-        <translation>contacts</translation>
+        <translation type="vanished">contacts</translation>
     </message>
     <message>
-        <location filename="../src/qml/patchmanager.cpp" line="54"/>
         <source>email</source>
-        <translation>email</translation>
+        <translation type="vanished">email</translation>
     </message>
     <message>
-        <location filename="../src/qml/patchmanager.cpp" line="55"/>
         <source>gallery</source>
-        <translation>gallery</translation>
+        <translation type="vanished">gallery</translation>
     </message>
     <message>
-        <location filename="../src/qml/patchmanager.cpp" line="56"/>
         <source>homescreen</source>
-        <translation>homescreen</translation>
+        <translation type="vanished">homescreen</translation>
     </message>
     <message>
-        <location filename="../src/qml/patchmanager.cpp" line="57"/>
         <source>media</source>
-        <translation>media</translation>
+        <translation type="vanished">media</translation>
     </message>
     <message>
-        <location filename="../src/qml/patchmanager.cpp" line="58"/>
         <source>messages</source>
-        <translation>messages</translation>
+        <translation type="vanished">messages</translation>
     </message>
     <message>
-        <location filename="../src/qml/patchmanager.cpp" line="59"/>
         <source>phone</source>
-        <translation>phone</translation>
+        <translation type="vanished">phone</translation>
     </message>
     <message>
-        <location filename="../src/qml/patchmanager.cpp" line="60"/>
         <source>silica</source>
-        <translation>silica</translation>
+        <translation type="vanished">silica</translation>
     </message>
     <message>
-        <location filename="../src/qml/patchmanager.cpp" line="61"/>
         <source>settings</source>
-        <translation>settings</translation>
+        <translation type="vanished">settings</translation>
     </message>
     <message>
-        <location filename="../src/qml/patchmanager.cpp" line="62"/>
-        <location filename="../src/qml/patchmanager.cpp" line="229"/>
         <source>other</source>
-        <translation>other</translation>
+        <translation type="vanished">other</translation>
     </message>
 </context>
-</TS>
\ No newline at end of file
+</TS>