Merge branch 'develop' into feature/nsi

src/UI/BigComponents/PrivacyPolicy.svelte

@@ -1,8 +1,15 @@
 <script lang="ts">
   import Tr from "../Base/Tr.svelte"
   import Translations from "../i18n/Translations"
+  import TagRenderingEditable from "../Popup/TagRendering/TagRenderingEditable.svelte"
+  import type { SpecialVisualizationState } from "../SpecialVisualization"
+  import UserRelatedState from "../../Logic/State/UserRelatedState"
 
   const t = Translations.t.privacy
+  export let state: SpecialVisualizationState
+  const usersettings = UserRelatedState.usersettingsConfig
+  const editPrivacy = usersettings.tagRenderings.find(tr => tr.id === "more_privacy")
+  const isLoggedIn = state.osmConnection.isLoggedIn
 </script>
 
 <div class="link-underline flex flex-col">
@@ -20,7 +27,41 @@
   <h3>
     <Tr t={t.editingTitle} />
   </h3>
-  <Tr t={t.editing} />
+  <Tr t={t.editingIntro} />
+  <Tr t={t.editingIntro} />
+  <ul>
+    <li>
+      <Tr t={t.items.changesYouMake} />
+    </li>
+    <li>
+      <Tr t={t.items.username} />
+    </li>
+    <li>
+      <Tr t={t.items.date} />
+    </li>
+    <li>
+      <Tr t={t.items.theme} />
+    </li>
+    <li>
+      <Tr t={t.items.language} />
+    </li>
+
+    <li>
+      {#if $isLoggedIn}
+      <TagRenderingEditable config={editPrivacy} selectedElement={{
+              type: "Feature",
+              properties: { id: "settings" },
+              geometry: { type: "Point", coordinates: [0, 0] },
+            }}
+                            {state}
+                            tags={state.userRelatedState.preferencesAsTags} />
+        {:else}
+          <Tr t={t.items.distanceIndicator} />
+        {/if}
+    </li>
+  </ul>
+
+  <Tr t={t.editingOutro} />
 
   <h3>
     <Tr t={t.miscCookiesTitle} />

src/UI/BigComponents/ThemeIntroPanel.svelte

@@ -15,6 +15,7 @@
   import Add from "../../assets/svg/Add.svelte"
   import Location_refused from "../../assets/svg/Location_refused.svelte"
   import Location from "../../assets/svg/Location.svelte"
+  import SpecialTranslation from "../Popup/TagRendering/SpecialTranslation.svelte"
 
   /**
    * The theme introduction panel
@@ -48,6 +49,7 @@
 <div class="flex h-full flex-col justify-between">
   <div>
     <!-- Intro, description, ... -->
+
     <Tr t={layout.description} />
     <Tr t={Translations.t.general.welcomeExplanation.general} />
     {#if layout.layers.some((l) => l.presets?.length > 0)}