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 @@
Unterhaltungen mit ungelesenen Nachrichten hervorheben
+<<<<<<< HEAD
Inhalte in Hinweisen verbergen
@@ -1618,6 +1619,11 @@
Beim Tippen auf eine zitierte Nachricht zu dieser springen anstatt es in einem Overlay anzuzeigen.
+=======
+
+ Inhalte in Hinweisen verbergen
+
+>>>>>>> f771a9a (Some minor adjustments)
SettingsPage
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
+<<<<<<< HEAD
@@ -1618,6 +1619,9 @@ messages
+=======
+
+>>>>>>> f771a9a (Some minor adjustments)
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 @@
+
+
+
+
+
+
+
+
+
+
+
+
SettingsPage
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 @@
+<<<<<<< HEAD
@@ -1617,6 +1618,9 @@
+=======
+
+>>>>>>> f771a9a (Some minor adjustments)
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 @@
+
+
+
+
+
+
+
+
+
+
+
+
SettingsPage
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 @@
+<<<<<<< HEAD
@@ -1588,6 +1589,9 @@
+=======
+
+>>>>>>> f771a9a (Some minor adjustments)
@@ -1697,6 +1701,7 @@
+<<<<<<< HEAD
@@ -1731,6 +1736,8 @@
+=======
+>>>>>>> f771a9a (Some minor adjustments)
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 @@
+<<<<<<< HEAD
@@ -1616,6 +1617,9 @@
+=======
+
+>>>>>>> f771a9a (Some minor adjustments)
@@ -1725,6 +1729,7 @@
+<<<<<<< HEAD
@@ -1760,6 +1765,8 @@
+=======
+>>>>>>> f771a9a (Some minor adjustments)
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 @@
+<<<<<<< HEAD
@@ -1644,6 +1645,9 @@
+=======
+
+>>>>>>> f771a9a (Some minor adjustments)
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 @@
По нажатию на цитируемое сообщение, переходить к нему в чате вместо отображения во всплывающем окне.
+
+
+
+
+
+
+
+
+
+
+
+
SettingsPage
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 @@
Färgmarkera konversationer med olästa meddelanden
+<<<<<<< HEAD
Dölj innehåll i aviseringar
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 @@
-<<<<<<< HEAD
@@ -1619,8 +1618,6 @@
-=======
->>>>>>> b11f7dd (Always append last message content to notifications (#514))
SettingsPage