Merge branch 'upstream'

This commit is contained in:
molan-git 2020-05-04 16:06:37 +02:00
commit 58622a0fdc

View file

@ -43,37 +43,38 @@
<translation>A cosa stai pensando?</translation>
</message>
<message>
<location filename="../qml/pages/Conversation.qml" line="275"/>
<location filename="../qml/pages/Conversation.qml" line="276"/>
<source>Delete</source>
<translation>Elimina</translation>
</message>
<message>
<location filename="../qml/pages/Conversation.qml" line="373"/>
<location filename="../qml/pages/Conversation.qml" line="376"/>
<source>Public</source>
<translation>Pubblico</translation>
</message>
<message>
<location filename="../qml/pages/Conversation.qml" line="376"/>
<location filename="../qml/pages/Conversation.qml" line="379"/>
<source>Unlisted</source>
<translation>Non elencato</translation>
</message>
<message>
<location filename="../qml/pages/Conversation.qml" line="379"/>
<location filename="../qml/pages/Conversation.qml" line="382"/>
<source>Followers-only</source>
<translation>Solo ai seguaci</translation>
</message>
<message>
<location filename="../qml/pages/Conversation.qml" line="382"/>
<location filename="../qml/pages/Conversation.qml" line="385"/>
<source>Direct</source>
<translation>Diretto</translation>
</message>
<message>
<location filename="../qml/pages/Conversation.qml" line="495"/>
<location filename="../qml/pages/Conversation.qml" line="499"/>
<source>Emojis</source>
<translation>Emojis</translation>
</message>
<message>
<location filename="../qml/pages/Conversation.qml" line="496"/>
<location filename="../qml/pages/Conversation.qml" line="500"/>
<source>Tap to insert</source>
<translation>Tap per inserire</translation>
</message>