From 442669ba207f35d9d236e7ecc1ef3db458f45ba5 Mon Sep 17 00:00:00 2001
From: Vlad G <b100dian@gmail.com>
Date: Wed, 29 Sep 2021 00:22:01 +0300
Subject: [PATCH] Revert "[ui] add descriptions in settings, rename developer
 mode (#53)"

This reverts transalation changes from 409f245f60b173a3a44cc3b591aa34f7cc9f77da.
---
 translations/settings-patchmanager-de.ts | 125 +++++++++++++----------
 translations/settings-patchmanager-en.ts | 123 ++++++++++++----------
 2 files changed, 141 insertions(+), 107 deletions(-)

diff --git a/translations/settings-patchmanager-de.ts b/translations/settings-patchmanager-de.ts
index 8d3bade3a..c4a0091a9 100644
--- a/translations/settings-patchmanager-de.ts
+++ b/translations/settings-patchmanager-de.ts
@@ -1,8 +1,6 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE TS>
-<TS version="2.1" language="de">
+<?xml version="1.0" ?><!DOCTYPE TS><TS language="de" version="2.1">
 <context>
-    <name></name>
+    <name/>
     <message>
         <location filename="../src/qml/AboutPage.qml" line="49"/>
         <location filename="../src/qml/PatchManagerPage.qml" line="142"/>
@@ -10,31 +8,39 @@
         <translation>Über Patchmanager</translation>
     </message>
     <message>
+        <location filename="../src/bin/dialog/dialog.qml" line="45"/>
         <source>Apply patches</source>
-        <translation type="vanished">Patches anwenden</translation>
+        <translation>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 type="vanished">Patchmanager wendet Patches automatisch in 10 Sekunden an.</translation>
+        <translation>Patchmanager wendet Patches automatisch in 10 Sekunden an.</translation>
     </message>
     <message>
+        <location filename="../src/bin/dialog/dialog.qml" line="66"/>
         <source>Exit</source>
-        <translation type="vanished">Beenden</translation>
+        <translation>Beenden</translation>
     </message>
     <message>
+        <location filename="../src/bin/dialog/dialog.qml" line="28"/>
         <source>Applying patches</source>
-        <translation type="vanished">Anwenden von Patches</translation>
+        <translation>Anwenden von Patches</translation>
     </message>
     <message>
+        <location filename="../src/bin/dialog/dialog.qml" line="136"/>
         <source>Appled successfully!</source>
-        <translation type="vanished">Erfolgreich angewendet!</translation>
+        <translation>Erfolgreich angewendet!</translation>
     </message>
     <message>
+        <location filename="../src/bin/dialog/dialog.qml" line="137"/>
         <source>Failed applying patches!</source>
-        <translation type="vanished">Fehler beim Anwenden von Patches!</translation>
+        <translation>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>
@@ -92,7 +98,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>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/qml/LegacyPatchPage.qml" line="73"/>
@@ -340,133 +346,144 @@
         <translation>Kompatibel zu: %1 </translation>
     </message>
     <message>
+        <location filename="../src/bin/patchmanager-daemon/patchmanagerobject.cpp" line="218"/>
         <source>Patch installed</source>
-        <translation type="vanished">Patch installiert</translation>
+        <translation>Patch installiert</translation>
     </message>
     <message>
+        <location filename="../src/bin/patchmanager-daemon/patchmanagerobject.cpp" line="219"/>
         <source>Patch %1 installed</source>
-        <translation type="vanished">Patch %1 installiert</translation>
+        <translation>Patch %1 installiert</translation>
     </message>
     <message>
+        <location filename="../src/bin/patchmanager-daemon/patchmanagerobject.cpp" line="222"/>
         <source>Patch removed</source>
-        <translation type="vanished">Patch entfernt</translation>
+        <translation>Patch entfernt</translation>
     </message>
     <message>
+        <location filename="../src/bin/patchmanager-daemon/patchmanagerobject.cpp" line="223"/>
         <source>Patch %1 removed</source>
-        <translation type="vanished">Patch %1 entfernt</translation>
+        <translation>Patch %1 entfernt</translation>
     </message>
     <message>
+        <location filename="../src/bin/patchmanager-daemon/patchmanagerobject.cpp" line="226"/>
         <source>Failed to install patch</source>
-        <translation type="vanished">Patch konnte nicht installiert werden</translation>
+        <translation>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 type="vanished">Patch %1 konnte nicht installiert werden</translation>
+        <translation>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 type="vanished">Patch konnte nicht entfernt werden</translation>
+        <translation>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 type="vanished">Patch %1 konnte nicht entfernt werden</translation>
+        <translation>Patch %1 konnte nicht entfernt werden</translation>
     </message>
     <message>
+        <location filename="../src/bin/patchmanager-daemon/patchmanagerobject.cpp" line="234"/>
         <source>Update available</source>
-        <translation type="vanished">Aktualisierung verfügbar</translation>
+        <translation>Aktualisierung verfügbar</translation>
     </message>
     <message>
+        <location filename="../src/bin/patchmanager-daemon/patchmanagerobject.cpp" line="235"/>
         <source>Patch %1 have update candidate</source>
-        <translation type="vanished">Aktualisierung für Patch %1 verfügbar</translation>
+        <translation>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="16"/>
+        <location filename="../src/qml/SettingsPage.qml" line="14"/>
         <source>Settings</source>
         <translation>Einstellungen</translation>
     </message>
     <message>
-        <location filename="../src/qml/SettingsPage.qml" line="20"/>
+        <location filename="../src/qml/SettingsPage.qml" line="18"/>
         <source>Apply on boot</source>
         <translation>Beim Booten anwenden</translation>
     </message>
     <message>
-        <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>
+        <location filename="../src/qml/SettingsPage.qml" line="25"/>
         <source>Developer mode</source>
-        <translation type="vanished">Entwickler-Modus</translation>
+        <translation>Entwickler-Modus</translation>
     </message>
 </context>
 <context>
     <name>Sections</name>
     <message>
+        <location filename="../src/qml/patchmanager.cpp" line="49"/>
         <source>browser</source>
-        <translation type="vanished">Browser</translation>
+        <translation>Browser</translation>
     </message>
     <message>
+        <location filename="../src/qml/patchmanager.cpp" line="50"/>
         <source>camera</source>
-        <translation type="vanished">Kamera</translation>
+        <translation>Kamera</translation>
     </message>
     <message>
+        <location filename="../src/qml/patchmanager.cpp" line="51"/>
         <source>calendar</source>
-        <translation type="vanished">Kalender</translation>
+        <translation>Kalender</translation>
     </message>
     <message>
+        <location filename="../src/qml/patchmanager.cpp" line="52"/>
         <source>clock</source>
-        <translation type="vanished">Uhr</translation>
+        <translation>Uhr</translation>
     </message>
     <message>
+        <location filename="../src/qml/patchmanager.cpp" line="53"/>
         <source>contacts</source>
-        <translation type="vanished">Kontakte</translation>
+        <translation>Kontakte</translation>
     </message>
     <message>
+        <location filename="../src/qml/patchmanager.cpp" line="54"/>
         <source>email</source>
-        <translation type="vanished">E-Mail</translation>
+        <translation>E-Mail</translation>
     </message>
     <message>
+        <location filename="../src/qml/patchmanager.cpp" line="55"/>
         <source>gallery</source>
-        <translation type="vanished">Gallerie</translation>
+        <translation>Gallerie</translation>
     </message>
     <message>
+        <location filename="../src/qml/patchmanager.cpp" line="56"/>
         <source>homescreen</source>
-        <translation type="vanished">Startbildschirm</translation>
+        <translation>Startbildschirm</translation>
     </message>
     <message>
+        <location filename="../src/qml/patchmanager.cpp" line="57"/>
         <source>media</source>
-        <translation type="vanished">Medien</translation>
+        <translation>Medien</translation>
     </message>
     <message>
+        <location filename="../src/qml/patchmanager.cpp" line="58"/>
         <source>messages</source>
-        <translation type="vanished">Nachrichten</translation>
+        <translation>Nachrichten</translation>
     </message>
     <message>
+        <location filename="../src/qml/patchmanager.cpp" line="59"/>
         <source>phone</source>
-        <translation type="vanished">Telefon</translation>
+        <translation>Telefon</translation>
     </message>
     <message>
+        <location filename="../src/qml/patchmanager.cpp" line="60"/>
         <source>silica</source>
-        <translation type="vanished">Silica</translation>
+        <translation>Silica</translation>
     </message>
     <message>
+        <location filename="../src/qml/patchmanager.cpp" line="61"/>
         <source>settings</source>
-        <translation type="vanished">Einstellungen</translation>
+        <translation>Einstellungen</translation>
     </message>
     <message>
+        <location filename="../src/qml/patchmanager.cpp" line="62"/>
+        <location filename="../src/qml/patchmanager.cpp" line="229"/>
         <source>other</source>
-        <translation type="vanished">Andere</translation>
+        <translation>Andere</translation>
     </message>
 </context>
-</TS>
+</TS>
\ No newline at end of file
diff --git a/translations/settings-patchmanager-en.ts b/translations/settings-patchmanager-en.ts
index 408c7b6c3..f53142775 100644
--- a/translations/settings-patchmanager-en.ts
+++ b/translations/settings-patchmanager-en.ts
@@ -1,8 +1,6 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE TS>
-<TS version="2.1" language="en">
+<?xml version="1.0" ?><!DOCTYPE TS><TS language="en" version="2.1">
 <context>
-    <name></name>
+    <name/>
     <message>
         <location filename="../src/qml/AboutPage.qml" line="49"/>
         <location filename="../src/qml/PatchManagerPage.qml" line="142"/>
@@ -10,31 +8,39 @@
         <translation>About</translation>
     </message>
     <message>
+        <location filename="../src/bin/dialog/dialog.qml" line="45"/>
         <source>Apply patches</source>
-        <translation type="vanished">Apply patches</translation>
+        <translation>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 type="vanished">Patchmanager will automatically apply patches in 10 seconds.</translation>
+        <translation>Patchmanager will automatically apply patches in 10 seconds.</translation>
     </message>
     <message>
+        <location filename="../src/bin/dialog/dialog.qml" line="66"/>
         <source>Exit</source>
-        <translation type="vanished">Exit</translation>
+        <translation>Exit</translation>
     </message>
     <message>
+        <location filename="../src/bin/dialog/dialog.qml" line="28"/>
         <source>Applying patches</source>
-        <translation type="vanished">Applying patches</translation>
+        <translation>Applying patches</translation>
     </message>
     <message>
+        <location filename="../src/bin/dialog/dialog.qml" line="136"/>
         <source>Appled successfully!</source>
-        <translation type="vanished">Appled successfully!</translation>
+        <translation>Appled successfully!</translation>
     </message>
     <message>
+        <location filename="../src/bin/dialog/dialog.qml" line="137"/>
         <source>Failed applying patches!</source>
-        <translation type="vanished">Failed applying patches!</translation>
+        <translation>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>
@@ -340,133 +346,144 @@
         <translation>Compatible: %1</translation>
     </message>
     <message>
+        <location filename="../src/bin/patchmanager-daemon/patchmanagerobject.cpp" line="218"/>
         <source>Patch installed</source>
-        <translation type="vanished">Patch installed</translation>
+        <translation>Patch installed</translation>
     </message>
     <message>
+        <location filename="../src/bin/patchmanager-daemon/patchmanagerobject.cpp" line="219"/>
         <source>Patch %1 installed</source>
-        <translation type="vanished">Patch %1 installed</translation>
+        <translation>Patch %1 installed</translation>
     </message>
     <message>
+        <location filename="../src/bin/patchmanager-daemon/patchmanagerobject.cpp" line="222"/>
         <source>Patch removed</source>
-        <translation type="vanished">Patch removed</translation>
+        <translation>Patch removed</translation>
     </message>
     <message>
+        <location filename="../src/bin/patchmanager-daemon/patchmanagerobject.cpp" line="223"/>
         <source>Patch %1 removed</source>
-        <translation type="vanished">Patch %1 removed</translation>
+        <translation>Patch %1 removed</translation>
     </message>
     <message>
+        <location filename="../src/bin/patchmanager-daemon/patchmanagerobject.cpp" line="226"/>
         <source>Failed to install patch</source>
-        <translation type="vanished">Failed to install patch</translation>
+        <translation>Failed to install patch</translation>
     </message>
     <message>
+        <location filename="../src/bin/patchmanager-daemon/patchmanagerobject.cpp" line="227"/>
         <source>Patch %1 installation failed</source>
-        <translation type="vanished">Patch %1 installation failed</translation>
+        <translation>Patch %1 installation failed</translation>
     </message>
     <message>
+        <location filename="../src/bin/patchmanager-daemon/patchmanagerobject.cpp" line="230"/>
         <source>Failed to remove patch</source>
-        <translation type="vanished">Failed to remove patch</translation>
+        <translation>Failed to remove patch</translation>
     </message>
     <message>
+        <location filename="../src/bin/patchmanager-daemon/patchmanagerobject.cpp" line="231"/>
         <source>Patch %1 removal failed</source>
-        <translation type="vanished">Patch %1 removal failed</translation>
+        <translation>Patch %1 removal failed</translation>
     </message>
     <message>
+        <location filename="../src/bin/patchmanager-daemon/patchmanagerobject.cpp" line="234"/>
         <source>Update available</source>
-        <translation type="vanished">Update available</translation>
+        <translation>Update available</translation>
     </message>
     <message>
+        <location filename="../src/bin/patchmanager-daemon/patchmanagerobject.cpp" line="235"/>
         <source>Patch %1 have update candidate</source>
-        <translation type="vanished">Patch %1 have update candidate</translation>
+        <translation>Patch %1 have update candidate</translation>
     </message>
     <message>
         <location filename="../src/qml/PatchManagerPage.qml" line="137"/>
-        <location filename="../src/qml/SettingsPage.qml" line="16"/>
+        <location filename="../src/qml/SettingsPage.qml" line="14"/>
         <source>Settings</source>
         <translation>Settings</translation>
     </message>
     <message>
-        <location filename="../src/qml/SettingsPage.qml" line="20"/>
+        <location filename="../src/qml/SettingsPage.qml" line="18"/>
         <source>Apply on boot</source>
         <translation>Apply on boot</translation>
     </message>
     <message>
-        <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>
+        <location filename="../src/qml/SettingsPage.qml" line="25"/>
         <source>Developer mode</source>
-        <translation type="vanished">Developer mode</translation>
+        <translation>Developer mode</translation>
     </message>
 </context>
 <context>
     <name>Sections</name>
     <message>
+        <location filename="../src/qml/patchmanager.cpp" line="49"/>
         <source>browser</source>
-        <translation type="vanished">browser</translation>
+        <translation>browser</translation>
     </message>
     <message>
+        <location filename="../src/qml/patchmanager.cpp" line="50"/>
         <source>camera</source>
-        <translation type="vanished">camera</translation>
+        <translation>camera</translation>
     </message>
     <message>
+        <location filename="../src/qml/patchmanager.cpp" line="51"/>
         <source>calendar</source>
-        <translation type="vanished">calendar</translation>
+        <translation>calendar</translation>
     </message>
     <message>
+        <location filename="../src/qml/patchmanager.cpp" line="52"/>
         <source>clock</source>
-        <translation type="vanished">clock</translation>
+        <translation>clock</translation>
     </message>
     <message>
+        <location filename="../src/qml/patchmanager.cpp" line="53"/>
         <source>contacts</source>
-        <translation type="vanished">contacts</translation>
+        <translation>contacts</translation>
     </message>
     <message>
+        <location filename="../src/qml/patchmanager.cpp" line="54"/>
         <source>email</source>
-        <translation type="vanished">email</translation>
+        <translation>email</translation>
     </message>
     <message>
+        <location filename="../src/qml/patchmanager.cpp" line="55"/>
         <source>gallery</source>
-        <translation type="vanished">gallery</translation>
+        <translation>gallery</translation>
     </message>
     <message>
+        <location filename="../src/qml/patchmanager.cpp" line="56"/>
         <source>homescreen</source>
-        <translation type="vanished">homescreen</translation>
+        <translation>homescreen</translation>
     </message>
     <message>
+        <location filename="../src/qml/patchmanager.cpp" line="57"/>
         <source>media</source>
-        <translation type="vanished">media</translation>
+        <translation>media</translation>
     </message>
     <message>
+        <location filename="../src/qml/patchmanager.cpp" line="58"/>
         <source>messages</source>
-        <translation type="vanished">messages</translation>
+        <translation>messages</translation>
     </message>
     <message>
+        <location filename="../src/qml/patchmanager.cpp" line="59"/>
         <source>phone</source>
-        <translation type="vanished">phone</translation>
+        <translation>phone</translation>
     </message>
     <message>
+        <location filename="../src/qml/patchmanager.cpp" line="60"/>
         <source>silica</source>
-        <translation type="vanished">silica</translation>
+        <translation>silica</translation>
     </message>
     <message>
+        <location filename="../src/qml/patchmanager.cpp" line="61"/>
         <source>settings</source>
-        <translation type="vanished">settings</translation>
+        <translation>settings</translation>
     </message>
     <message>
+        <location filename="../src/qml/patchmanager.cpp" line="62"/>
+        <location filename="../src/qml/patchmanager.cpp" line="229"/>
         <source>other</source>
-        <translation type="vanished">other</translation>
+        <translation>other</translation>
     </message>
 </context>
-</TS>
+</TS>
\ No newline at end of file