Some minor adjustments

This commit is contained in:
Sebastian Wolf 2023-11-18 23:39:09 +01:00 committed by Nikolay Sinyov
parent 77f03f1f02
commit 070f3e1bd7
11 changed files with 69 additions and 3 deletions

View file

@ -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>

View file

@ -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>

View file

@ -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>

View file

@ -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>

View file

@ -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>

View file

@ -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>

View file

@ -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>

View file

@ -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>

View file

@ -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>

View file

@ -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>

View file

@ -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>