From 070f3e1bd744b34b4fad9e0e1f3a56678b10785e Mon Sep 17 00:00:00 2001
From: Sebastian Wolf <sebastian@ygriega.de>
Date: Sat, 18 Nov 2023 23:39:09 +0100
Subject: [PATCH] Some minor adjustments

---
 translations/harbour-fernschreiber-de.ts |  6 ++++++
 translations/harbour-fernschreiber-en.ts |  4 ++++
 translations/harbour-fernschreiber-es.ts | 12 ++++++++++++
 translations/harbour-fernschreiber-fi.ts |  4 ++++
 translations/harbour-fernschreiber-fr.ts | 12 ++++++++++++
 translations/harbour-fernschreiber-hu.ts |  7 +++++++
 translations/harbour-fernschreiber-it.ts |  7 +++++++
 translations/harbour-fernschreiber-pl.ts |  4 ++++
 translations/harbour-fernschreiber-ru.ts | 12 ++++++++++++
 translations/harbour-fernschreiber-sv.ts |  1 +
 translations/harbour-fernschreiber.ts    |  3 ---
 11 files changed, 69 insertions(+), 3 deletions(-)

diff --git a/translations/harbour-fernschreiber-de.ts b/translations/harbour-fernschreiber-de.ts
index ef14fdf..f6ce4b3 100644
--- a/translations/harbour-fernschreiber-de.ts
+++ b/translations/harbour-fernschreiber-de.ts
@@ -1607,6 +1607,7 @@
         <translation>Unterhaltungen mit ungelesenen Nachrichten hervorheben</translation>
     </message>
     <message>
+<<<<<<< HEAD
         <source>Hide content in notifications</source>
         <translation>Inhalte in Hinweisen verbergen</translation>
     </message>
@@ -1618,6 +1619,11 @@
         <source>When tapping a quoted message, open it in chat instead of showing it in an overlay.</source>
         <translation>Beim Tippen auf eine zitierte Nachricht zu dieser springen anstatt es in einem Overlay anzuzeigen.</translation>
     </message>
+=======
+        <source>Hide content in Notifications</source>
+        <translation>Inhalte in Hinweisen verbergen</translation>
+    </message>
+>>>>>>> f771a9a (Some minor adjustments)
 </context>
 <context>
     <name>SettingsPage</name>
diff --git a/translations/harbour-fernschreiber-en.ts b/translations/harbour-fernschreiber-en.ts
index 4f9f525..39496c0 100644
--- a/translations/harbour-fernschreiber-en.ts
+++ b/translations/harbour-fernschreiber-en.ts
@@ -1609,6 +1609,7 @@ messages</numerusform>
         <translation type="unfinished"></translation>
     </message>
     <message>
+<<<<<<< HEAD
         <source>Hide content in notifications</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1618,6 +1619,9 @@ messages</numerusform>
     </message>
     <message>
         <source>When tapping a quoted message, open it in chat instead of showing it in an overlay.</source>
+=======
+        <source>Hide content in Notifications</source>
+>>>>>>> f771a9a (Some minor adjustments)
         <translation type="unfinished"></translation>
     </message>
 </context>
diff --git a/translations/harbour-fernschreiber-es.ts b/translations/harbour-fernschreiber-es.ts
index 5669837..d7523cc 100644
--- a/translations/harbour-fernschreiber-es.ts
+++ b/translations/harbour-fernschreiber-es.ts
@@ -1626,6 +1626,18 @@
         <source>In addition to showing the number of unread messages, the latest message will also be appended to notifications.</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Highlight unread messages</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Highlight Conversations with unread messages</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Hide content in Notifications</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>SettingsPage</name>
diff --git a/translations/harbour-fernschreiber-fi.ts b/translations/harbour-fernschreiber-fi.ts
index 691fae8..8dd5348 100644
--- a/translations/harbour-fernschreiber-fi.ts
+++ b/translations/harbour-fernschreiber-fi.ts
@@ -1608,6 +1608,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
+<<<<<<< HEAD
         <source>Hide content in notifications</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1617,6 +1618,9 @@
     </message>
     <message>
         <source>When tapping a quoted message, open it in chat instead of showing it in an overlay.</source>
+=======
+        <source>Hide content in Notifications</source>
+>>>>>>> f771a9a (Some minor adjustments)
         <translation type="unfinished"></translation>
     </message>
 </context>
diff --git a/translations/harbour-fernschreiber-fr.ts b/translations/harbour-fernschreiber-fr.ts
index d011ef1..d036871 100644
--- a/translations/harbour-fernschreiber-fr.ts
+++ b/translations/harbour-fernschreiber-fr.ts
@@ -1618,6 +1618,18 @@
         <source>When tapping a quoted message, open it in chat instead of showing it in an overlay.</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Highlight unread messages</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Highlight Conversations with unread messages</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Hide content in Notifications</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>SettingsPage</name>
diff --git a/translations/harbour-fernschreiber-hu.ts b/translations/harbour-fernschreiber-hu.ts
index 60dbe5a..3c5a445 100644
--- a/translations/harbour-fernschreiber-hu.ts
+++ b/translations/harbour-fernschreiber-hu.ts
@@ -1579,6 +1579,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
+<<<<<<< HEAD
         <source>Hide content in notifications</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1588,6 +1589,9 @@
     </message>
     <message>
         <source>When tapping a quoted message, open it in chat instead of showing it in an overlay.</source>
+=======
+        <source>Hide content in Notifications</source>
+>>>>>>> f771a9a (Some minor adjustments)
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -1697,6 +1701,7 @@
     </message>
     <message>
         <source>Active since: %1, last online: %2</source>
+<<<<<<< HEAD
         <translation type="unfinished"></translation>
     </message>
     <message numerus="yes">
@@ -1731,6 +1736,8 @@
     </message>
     <message>
         <source>Inactive sessions will be terminated after this timeframe</source>
+=======
+>>>>>>> f771a9a (Some minor adjustments)
         <translation type="unfinished"></translation>
     </message>
 </context>
diff --git a/translations/harbour-fernschreiber-it.ts b/translations/harbour-fernschreiber-it.ts
index 67d1bdf..8c62d93 100644
--- a/translations/harbour-fernschreiber-it.ts
+++ b/translations/harbour-fernschreiber-it.ts
@@ -1607,6 +1607,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
+<<<<<<< HEAD
         <source>Hide content in notifications</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1616,6 +1617,9 @@
     </message>
     <message>
         <source>When tapping a quoted message, open it in chat instead of showing it in an overlay.</source>
+=======
+        <source>Hide content in Notifications</source>
+>>>>>>> f771a9a (Some minor adjustments)
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -1725,6 +1729,7 @@
     </message>
     <message>
         <source>Active since: %1, last online: %2</source>
+<<<<<<< HEAD
         <translation type="unfinished"></translation>
     </message>
     <message numerus="yes">
@@ -1760,6 +1765,8 @@
     </message>
     <message>
         <source>Inactive sessions will be terminated after this timeframe</source>
+=======
+>>>>>>> f771a9a (Some minor adjustments)
         <translation type="unfinished"></translation>
     </message>
 </context>
diff --git a/translations/harbour-fernschreiber-pl.ts b/translations/harbour-fernschreiber-pl.ts
index 261f37d..95f5ffb 100644
--- a/translations/harbour-fernschreiber-pl.ts
+++ b/translations/harbour-fernschreiber-pl.ts
@@ -1635,6 +1635,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
+<<<<<<< HEAD
         <source>Hide content in notifications</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1644,6 +1645,9 @@
     </message>
     <message>
         <source>When tapping a quoted message, open it in chat instead of showing it in an overlay.</source>
+=======
+        <source>Hide content in Notifications</source>
+>>>>>>> f771a9a (Some minor adjustments)
         <translation type="unfinished"></translation>
     </message>
 </context>
diff --git a/translations/harbour-fernschreiber-ru.ts b/translations/harbour-fernschreiber-ru.ts
index 0913993..c385e5a 100644
--- a/translations/harbour-fernschreiber-ru.ts
+++ b/translations/harbour-fernschreiber-ru.ts
@@ -1649,6 +1649,18 @@
         <source>When tapping a quoted message, open it in chat instead of showing it in an overlay.</source>
         <translation>По нажатию на цитируемое сообщение, переходить к нему в чате вместо отображения во всплывающем окне.</translation>
     </message>
+    <message>
+        <source>Highlight unread messages</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Highlight Conversations with unread messages</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Hide content in Notifications</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>SettingsPage</name>
diff --git a/translations/harbour-fernschreiber-sv.ts b/translations/harbour-fernschreiber-sv.ts
index 16953c3..480a402 100644
--- a/translations/harbour-fernschreiber-sv.ts
+++ b/translations/harbour-fernschreiber-sv.ts
@@ -1607,6 +1607,7 @@
         <translation>Färgmarkera konversationer med olästa meddelanden</translation>
     </message>
     <message>
+<<<<<<< HEAD
         <source>Hide content in notifications</source>
         <translation>Dölj innehåll i aviseringar</translation>
     </message>
diff --git a/translations/harbour-fernschreiber.ts b/translations/harbour-fernschreiber.ts
index a2fe241..134628e 100644
--- a/translations/harbour-fernschreiber.ts
+++ b/translations/harbour-fernschreiber.ts
@@ -1598,7 +1598,6 @@
         <source>In addition to showing the number of unread messages, the latest message will also be appended to notifications.</source>
         <translation type="unfinished"></translation>
     </message>
-<<<<<<< HEAD
     <message>
         <source>Highlight unread messages</source>
         <translation type="unfinished"></translation>
@@ -1619,8 +1618,6 @@
         <source>When tapping a quoted message, open it in chat instead of showing it in an overlay.</source>
         <translation type="unfinished"></translation>
     </message>
-=======
->>>>>>> b11f7dd (Always append last message content to notifications (#514))
 </context>
 <context>
     <name>SettingsPage</name>