From ca94e7971b53fe85ab1564d627d02675641a66e7 Mon Sep 17 00:00:00 2001
From: Sebastian Wolf <sebastian@ygriega.de>
Date: Wed, 3 Feb 2021 21:54:46 +0100
Subject: [PATCH] Merge privacy settings

---
 qml/pages/SettingsPage.qml               | 24 ++++++++++--------------
 translations/harbour-fernschreiber-it.ts |  4 ++--
 2 files changed, 12 insertions(+), 16 deletions(-)

diff --git a/qml/pages/SettingsPage.qml b/qml/pages/SettingsPage.qml
index 9e414fa..0ee2a37 100644
--- a/qml/pages/SettingsPage.qml
+++ b/qml/pages/SettingsPage.qml
@@ -518,6 +518,16 @@ Page {
 
             }
 
+            TextSwitch {
+                checked: appSettings.allowInlineBotLocationAccess
+                text: qsTr("Allow sending Location to inline bots")
+                description: qsTr("Some inline bots request location data when using them")
+                automaticCheck: false
+                onClicked: {
+                    appSettings.allowInlineBotLocationAccess = !checked
+                }
+            }
+
             SectionHeader {
                 text: qsTr("Behavior")
             }
@@ -680,20 +690,6 @@ Page {
                 }
             }
 
-            SectionHeader {
-                text: qsTr("Privacy")
-            }
-
-            TextSwitch {
-                checked: appSettings.allowInlineBotLocationAccess
-                text: qsTr("Allow sending Location to inline bots")
-                description: qsTr("Some inline bots request location data when using them")
-                automaticCheck: false
-                onClicked: {
-                    appSettings.allowInlineBotLocationAccess = !checked
-                }
-            }
-
             SectionHeader {
                 text: qsTr("Storage")
             }
diff --git a/translations/harbour-fernschreiber-it.ts b/translations/harbour-fernschreiber-it.ts
index 84807f1..1205a35 100644
--- a/translations/harbour-fernschreiber-it.ts
+++ b/translations/harbour-fernschreiber-it.ts
@@ -1311,7 +1311,7 @@
     </message>
     <message>
         <source>Shown when the user selects a wrong answer.</source>
-        <translation>Mostra quando l'utente sceglie una risposta errata.</translation>
+        <translation>Mostra quando l&apos;utente sceglie una risposta errata.</translation>
     </message>
     <message>
         <source>An explanation can be up to 200 characters long.</source>
@@ -1640,7 +1640,7 @@
     </message>
     <message>
         <source>When sounds are enabled, Fernschreiber will use the current Sailfish OS notification sound for chats, which can be configured in the system settings.</source>
-        <translation>Quando i suoni di notifica sono attivi, Fernschreiber utilizza l'attuale suono di notifica per i messaggi scelto per Sailfish OS, il quale può essere modificato dalle impostazioni di sistema.</translation>
+        <translation>Quando i suoni di notifica sono attivi, Fernschreiber utilizza l&apos;attuale suono di notifica per i messaggi scelto per Sailfish OS, il quale può essere modificato dalle impostazioni di sistema.</translation>
     </message>
 </context>
 <context>